From d6b5bdb0778ec9613aaa4d6261d8fd438a548b56 Mon Sep 17 00:00:00 2001
From: James Ketrenos <jketreno@linux.intel.com>
Date: Wed, 21 Sep 2005 11:58:56 -0500
Subject: [PATCH] --- yaml --- r: 10264 b: refs/heads/master c:
 e5658d3e8a347f4393a9403b0cec8d43fa6214b1 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/net/ieee80211.h | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 16d9749679c6..94af1ce57588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b59eaee8f8ec29d8cb6ac0c8eed086689d8030
+refs/heads/master: e5658d3e8a347f4393a9403b0cec8d43fa6214b1
diff --git a/trunk/include/net/ieee80211.h b/trunk/include/net/ieee80211.h
index 220a9e3c91fa..4a381a074fdd 100644
--- a/trunk/include/net/ieee80211.h
+++ b/trunk/include/net/ieee80211.h
@@ -603,17 +603,21 @@ struct ieee80211_auth {
 	__le16 algorithm;
 	__le16 transaction;
 	__le16 status;
+	/* challenge */
 	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
 struct ieee80211_disassoc {
 	struct ieee80211_hdr_3addr header;
-	__le16 reason_code;
-	struct ieee80211_info_element info_element[0];
+	__le16 reason;
 } __attribute__ ((packed));
 
+/* Alias deauth for disassoc */
+#define ieee82011_deauth ieee80211_disassoc
+
 struct ieee80211_probe_request {
 	struct ieee80211_hdr_3addr header;
+	/* SSID, supported rates */
 	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
@@ -622,6 +626,8 @@ struct ieee80211_probe_response {
 	u32 time_stamp[2];
 	__le16 beacon_interval;
 	__le16 capability;
+	/* SSID, supported rates, FH params, DS params,
+	 * CF params, IBSS params, TIM (if beacon), RSN */
 	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
@@ -632,6 +638,7 @@ struct ieee80211_assoc_request {
 	struct ieee80211_hdr_3addr header;
 	__le16 capability;
 	__le16 listen_interval;
+	/* SSID, supported rates, RSN */
 	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
@@ -648,7 +655,8 @@ struct ieee80211_assoc_response {
 	__le16 capability;
 	__le16 status;
 	__le16 aid;
-	struct ieee80211_info_element info_element[0];	/* supported rates */
+	/* supported rates */
+	struct ieee80211_info_element info_element[0];
 } __attribute__ ((packed));
 
 struct ieee80211_txb {