aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/ieee80211.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 220a9e3c91fa..4a381a074fdd 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -603,17 +603,21 @@ struct ieee80211_auth {
603 __le16 algorithm; 603 __le16 algorithm;
604 __le16 transaction; 604 __le16 transaction;
605 __le16 status; 605 __le16 status;
606 /* challenge */
606 struct ieee80211_info_element info_element[0]; 607 struct ieee80211_info_element info_element[0];
607} __attribute__ ((packed)); 608} __attribute__ ((packed));
608 609
609struct ieee80211_disassoc { 610struct ieee80211_disassoc {
610 struct ieee80211_hdr_3addr header; 611 struct ieee80211_hdr_3addr header;
611 __le16 reason_code; 612 __le16 reason;
612 struct ieee80211_info_element info_element[0];
613} __attribute__ ((packed)); 613} __attribute__ ((packed));
614 614
615/* Alias deauth for disassoc */
616#define ieee82011_deauth ieee80211_disassoc
617
615struct ieee80211_probe_request { 618struct ieee80211_probe_request {
616 struct ieee80211_hdr_3addr header; 619 struct ieee80211_hdr_3addr header;
620 /* SSID, supported rates */
617 struct ieee80211_info_element info_element[0]; 621 struct ieee80211_info_element info_element[0];
618} __attribute__ ((packed)); 622} __attribute__ ((packed));
619 623
@@ -622,6 +626,8 @@ struct ieee80211_probe_response {
622 u32 time_stamp[2]; 626 u32 time_stamp[2];
623 __le16 beacon_interval; 627 __le16 beacon_interval;
624 __le16 capability; 628 __le16 capability;
629 /* SSID, supported rates, FH params, DS params,
630 * CF params, IBSS params, TIM (if beacon), RSN */
625 struct ieee80211_info_element info_element[0]; 631 struct ieee80211_info_element info_element[0];
626} __attribute__ ((packed)); 632} __attribute__ ((packed));
627 633
@@ -632,6 +638,7 @@ struct ieee80211_assoc_request {
632 struct ieee80211_hdr_3addr header; 638 struct ieee80211_hdr_3addr header;
633 __le16 capability; 639 __le16 capability;
634 __le16 listen_interval; 640 __le16 listen_interval;
641 /* SSID, supported rates, RSN */
635 struct ieee80211_info_element info_element[0]; 642 struct ieee80211_info_element info_element[0];
636} __attribute__ ((packed)); 643} __attribute__ ((packed));
637 644
@@ -648,7 +655,8 @@ struct ieee80211_assoc_response {
648 __le16 capability; 655 __le16 capability;
649 __le16 status; 656 __le16 status;
650 __le16 aid; 657 __le16 aid;
651 struct ieee80211_info_element info_element[0]; /* supported rates */ 658 /* supported rates */
659 struct ieee80211_info_element info_element[0];
652} __attribute__ ((packed)); 660} __attribute__ ((packed));
653 661
654struct ieee80211_txb { 662struct ieee80211_txb {