[Ieee80211-devel] Re: [PATCH 15/29] ieee80211 Renamed ieee80211_hdr to ieee80211_hdr_4addr

[James K. <jke...@li...>]

Michael Wu wrote:

>(resend, don't know why kmail decided to send to oss.sgi.com)
>
>This patch plus patch 5 looks very similar to my management frame patch 
>except..
>  
>
Yes, I noticed that when I saw your patch today.

I liked that you added more IE comments.

>On Tuesday 13 September 2005 18:53, James Ketrenos wrote:
>  
>
>>@@ -552,6 +577,17 @@ struct ieee80211_authentication {
>> 	struct ieee80211_info_element info_element[0];
>> } __attribute__ ((packed));
>>
>>+struct ieee80211_disassoc {
>>    
>>
>Add alias for deauthentication frame here?
>  
>
Done.

>  
>
>>+	struct ieee80211_hdr_3addr header;
>>+	u16 reason_code;
>>    
>>
>If we do not append _code to "status", why append _code to "reason"?
>  
>
I can't think of any good reasons.    _code removed.

See patch below (cumulative to prior series):

 include/net/ieee80211.h |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -609,17 +609,22 @@ 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;
+	__le16 reason;
 	struct ieee80211_info_element info_element[0];
 } __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));
 
@@ -628,6 +633,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));
 
@@ -638,6 +645,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));
 
@@ -654,7 +662,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 {