Skip to content

Commit

Permalink
[PATCH] ieee80211: added IE comments, reason_code to reason, removed …
Browse files Browse the repository at this point in the history
…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: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
James Ketrenos authored and Jeff Garzik committed Sep 22, 2005
1 parent 31b59ea commit e5658d3
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions include/net/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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));

Expand All @@ -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));

Expand All @@ -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 {
Expand Down

0 comments on commit e5658d3

Please sign in to comment.