diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ieee80211.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index b3815fd810c8..372a173d36df 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -503,68 +503,68 @@ enum ieee80211_mfie { | |||
503 | * information to determine what type of underlying data type is actually | 503 | * information to determine what type of underlying data type is actually |
504 | * stored in the data. */ | 504 | * stored in the data. */ |
505 | struct ieee80211_hdr { | 505 | struct ieee80211_hdr { |
506 | u16 frame_ctl; | 506 | __le16 frame_ctl; |
507 | u16 duration_id; | 507 | __le16 duration_id; |
508 | u8 payload[0]; | 508 | u8 payload[0]; |
509 | } __attribute__ ((packed)); | 509 | } __attribute__ ((packed)); |
510 | 510 | ||
511 | struct ieee80211_hdr_1addr { | 511 | struct ieee80211_hdr_1addr { |
512 | u16 frame_ctl; | 512 | __le16 frame_ctl; |
513 | u16 duration_id; | 513 | __le16 duration_id; |
514 | u8 addr1[ETH_ALEN]; | 514 | u8 addr1[ETH_ALEN]; |
515 | u8 payload[0]; | 515 | u8 payload[0]; |
516 | } __attribute__ ((packed)); | 516 | } __attribute__ ((packed)); |
517 | 517 | ||
518 | struct ieee80211_hdr_2addr { | 518 | struct ieee80211_hdr_2addr { |
519 | u16 frame_ctl; | 519 | __le16 frame_ctl; |
520 | u16 duration_id; | 520 | __le16 duration_id; |
521 | u8 addr1[ETH_ALEN]; | 521 | u8 addr1[ETH_ALEN]; |
522 | u8 addr2[ETH_ALEN]; | 522 | u8 addr2[ETH_ALEN]; |
523 | u8 payload[0]; | 523 | u8 payload[0]; |
524 | } __attribute__ ((packed)); | 524 | } __attribute__ ((packed)); |
525 | 525 | ||
526 | struct ieee80211_hdr_3addr { | 526 | struct ieee80211_hdr_3addr { |
527 | u16 frame_ctl; | 527 | __le16 frame_ctl; |
528 | u16 duration_id; | 528 | __le16 duration_id; |
529 | u8 addr1[ETH_ALEN]; | 529 | u8 addr1[ETH_ALEN]; |
530 | u8 addr2[ETH_ALEN]; | 530 | u8 addr2[ETH_ALEN]; |
531 | u8 addr3[ETH_ALEN]; | 531 | u8 addr3[ETH_ALEN]; |
532 | u16 seq_ctl; | 532 | __le16 seq_ctl; |
533 | u8 payload[0]; | 533 | u8 payload[0]; |
534 | } __attribute__ ((packed)); | 534 | } __attribute__ ((packed)); |
535 | 535 | ||
536 | struct ieee80211_hdr_4addr { | 536 | struct ieee80211_hdr_4addr { |
537 | u16 frame_ctl; | 537 | __le16 frame_ctl; |
538 | u16 duration_id; | 538 | __le16 duration_id; |
539 | u8 addr1[ETH_ALEN]; | 539 | u8 addr1[ETH_ALEN]; |
540 | u8 addr2[ETH_ALEN]; | 540 | u8 addr2[ETH_ALEN]; |
541 | u8 addr3[ETH_ALEN]; | 541 | u8 addr3[ETH_ALEN]; |
542 | u16 seq_ctl; | 542 | __le16 seq_ctl; |
543 | u8 addr4[ETH_ALEN]; | 543 | u8 addr4[ETH_ALEN]; |
544 | u8 payload[0]; | 544 | u8 payload[0]; |
545 | } __attribute__ ((packed)); | 545 | } __attribute__ ((packed)); |
546 | 546 | ||
547 | struct ieee80211_hdr_3addrqos { | 547 | struct ieee80211_hdr_3addrqos { |
548 | u16 frame_ctl; | 548 | __le16 frame_ctl; |
549 | u16 duration_id; | 549 | __le16 duration_id; |
550 | u8 addr1[ETH_ALEN]; | 550 | u8 addr1[ETH_ALEN]; |
551 | u8 addr2[ETH_ALEN]; | 551 | u8 addr2[ETH_ALEN]; |
552 | u8 addr3[ETH_ALEN]; | 552 | u8 addr3[ETH_ALEN]; |
553 | u16 seq_ctl; | 553 | __le16 seq_ctl; |
554 | u8 payload[0]; | 554 | u8 payload[0]; |
555 | u16 qos_ctl; | 555 | __le16 qos_ctl; |
556 | } __attribute__ ((packed)); | 556 | } __attribute__ ((packed)); |
557 | 557 | ||
558 | struct ieee80211_hdr_4addrqos { | 558 | struct ieee80211_hdr_4addrqos { |
559 | u16 frame_ctl; | 559 | __le16 frame_ctl; |
560 | u16 duration_id; | 560 | __le16 duration_id; |
561 | u8 addr1[ETH_ALEN]; | 561 | u8 addr1[ETH_ALEN]; |
562 | u8 addr2[ETH_ALEN]; | 562 | u8 addr2[ETH_ALEN]; |
563 | u8 addr3[ETH_ALEN]; | 563 | u8 addr3[ETH_ALEN]; |
564 | u16 seq_ctl; | 564 | __le16 seq_ctl; |
565 | u8 addr4[ETH_ALEN]; | 565 | u8 addr4[ETH_ALEN]; |
566 | u8 payload[0]; | 566 | u8 payload[0]; |
567 | u16 qos_ctl; | 567 | __le16 qos_ctl; |
568 | } __attribute__ ((packed)); | 568 | } __attribute__ ((packed)); |
569 | 569 | ||
570 | struct ieee80211_info_element { | 570 | struct ieee80211_info_element { |
@@ -600,7 +600,7 @@ struct ieee80211_auth { | |||
600 | 600 | ||
601 | struct ieee80211_disassoc { | 601 | struct ieee80211_disassoc { |
602 | struct ieee80211_hdr_3addr header; | 602 | struct ieee80211_hdr_3addr header; |
603 | u16 reason_code; | 603 | __le16 reason_code; |
604 | struct ieee80211_info_element info_element[0]; | 604 | struct ieee80211_info_element info_element[0]; |
605 | } __attribute__ ((packed)); | 605 | } __attribute__ ((packed)); |
606 | 606 | ||
@@ -622,8 +622,8 @@ struct ieee80211_probe_response { | |||
622 | 622 | ||
623 | struct ieee80211_assoc_request { | 623 | struct ieee80211_assoc_request { |
624 | struct ieee80211_hdr_3addr header; | 624 | struct ieee80211_hdr_3addr header; |
625 | u16 capability; | 625 | __le16 capability; |
626 | u16 listen_interval; | 626 | __le16 listen_interval; |
627 | struct ieee80211_info_element info_element[0]; | 627 | struct ieee80211_info_element info_element[0]; |
628 | } __attribute__ ((packed)); | 628 | } __attribute__ ((packed)); |
629 | 629 | ||
@@ -648,8 +648,8 @@ struct ieee80211_txb { | |||
648 | u8 encrypted; | 648 | u8 encrypted; |
649 | u8 rts_included; | 649 | u8 rts_included; |
650 | u8 reserved; | 650 | u8 reserved; |
651 | u16 frag_size; | 651 | __le16 frag_size; |
652 | u16 payload_size; | 652 | __le16 payload_size; |
653 | struct sk_buff *fragments[0]; | 653 | struct sk_buff *fragments[0]; |
654 | }; | 654 | }; |
655 | 655 | ||
@@ -699,7 +699,7 @@ struct ieee80211_qos_information_element { | |||
699 | struct ieee80211_qos_ac_parameter { | 699 | struct ieee80211_qos_ac_parameter { |
700 | u8 aci_aifsn; | 700 | u8 aci_aifsn; |
701 | u8 ecw_min_max; | 701 | u8 ecw_min_max; |
702 | u16 tx_op_limit; | 702 | __le16 tx_op_limit; |
703 | } __attribute__ ((packed)); | 703 | } __attribute__ ((packed)); |
704 | 704 | ||
705 | struct ieee80211_qos_parameter_info { | 705 | struct ieee80211_qos_parameter_info { |
@@ -709,11 +709,11 @@ struct ieee80211_qos_parameter_info { | |||
709 | } __attribute__ ((packed)); | 709 | } __attribute__ ((packed)); |
710 | 710 | ||
711 | struct ieee80211_qos_parameters { | 711 | struct ieee80211_qos_parameters { |
712 | u16 cw_min[QOS_QUEUE_NUM]; | 712 | __le16 cw_min[QOS_QUEUE_NUM]; |
713 | u16 cw_max[QOS_QUEUE_NUM]; | 713 | __le16 cw_max[QOS_QUEUE_NUM]; |
714 | u8 aifs[QOS_QUEUE_NUM]; | 714 | u8 aifs[QOS_QUEUE_NUM]; |
715 | u8 flag[QOS_QUEUE_NUM]; | 715 | u8 flag[QOS_QUEUE_NUM]; |
716 | u16 tx_op_limit[QOS_QUEUE_NUM]; | 716 | __le16 tx_op_limit[QOS_QUEUE_NUM]; |
717 | } __attribute__ ((packed)); | 717 | } __attribute__ ((packed)); |
718 | 718 | ||
719 | struct ieee80211_qos_data { | 719 | struct ieee80211_qos_data { |