Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5658d3e authored by James Ketrenos's avatar James Ketrenos Committed by Jeff Garzik
Browse files

[PATCH] ieee80211: added IE comments, reason_code to reason, removed... 


[PATCH] ieee80211: added IE comments, reason_code to reason, removed info_element from ieee80211_disassoc

tree 0254e7c97cece038cd11b47a16027c6379e464fe
parent a84f7713dc87ca1b51c6d53b391087663425a080
author James Ketrenos <jketreno@linux.intel.com> 1126661324 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127319069 -0500

Updated based on Michael Wu's patch and comments sent to netdev.

Added IE comments to ieee80211_* frame structures.
Changed reason_code to reason (consistency)
Removed info_element from ieee80211_disassoc

Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 31b59eae

include/net/ieee80211.h

+11 −3
Original line number Original line Diff line number Diff line
@@ -603,17 +603,21 @@ struct ieee80211_auth { 
	__le16 algorithm;

	__le16 algorithm;

	__le16 transaction;

	__le16 transaction;

	__le16 status;

	__le16 status;

	/* challenge */

	struct ieee80211_info_element info_element[0];

	struct ieee80211_info_element info_element[0];

} __attribute__ ((packed));

} __attribute__ ((packed));





struct ieee80211_disassoc {

struct ieee80211_disassoc {

	struct ieee80211_hdr_3addr header;

	struct ieee80211_hdr_3addr header;

	__le16 reason_code;

	__le16 reason;

	struct ieee80211_info_element info_element[0];

} __attribute__ ((packed));

} __attribute__ ((packed));





/* Alias deauth for disassoc */

#define ieee82011_deauth ieee80211_disassoc



struct ieee80211_probe_request {

struct ieee80211_probe_request {

	struct ieee80211_hdr_3addr header;

	struct ieee80211_hdr_3addr header;

	/* SSID, supported rates */

	struct ieee80211_info_element info_element[0];

	struct ieee80211_info_element info_element[0];

} __attribute__ ((packed));

} __attribute__ ((packed));
@@ -622,6 +626,8 @@ struct ieee80211_probe_response { 
	u32 time_stamp[2];

	u32 time_stamp[2];

	__le16 beacon_interval;

	__le16 beacon_interval;

	__le16 capability;

	__le16 capability;

	/* SSID, supported rates, FH params, DS params,

	 * CF params, IBSS params, TIM (if beacon), RSN */

	struct ieee80211_info_element info_element[0];

	struct ieee80211_info_element info_element[0];

} __attribute__ ((packed));

} __attribute__ ((packed));
@@ -632,6 +638,7 @@ struct ieee80211_assoc_request { 
	struct ieee80211_hdr_3addr header;

	struct ieee80211_hdr_3addr header;

	__le16 capability;

	__le16 capability;

	__le16 listen_interval;

	__le16 listen_interval;

	/* SSID, supported rates, RSN */

	struct ieee80211_info_element info_element[0];

	struct ieee80211_info_element info_element[0];

} __attribute__ ((packed));

} __attribute__ ((packed));
@@ -648,7 +655,8 @@ struct ieee80211_assoc_response { 
	__le16 capability;

	__le16 capability;

	__le16 status;

	__le16 status;

	__le16 aid;

	__le16 aid;

	struct ieee80211_info_element info_element[0];	/* supported rates */

	/* supported rates */

	struct ieee80211_info_element info_element[0];

} __attribute__ ((packed));

} __attribute__ ((packed));





struct ieee80211_txb {

struct ieee80211_txb {