summaryrefslogtreecommitdiffstats
path: root/include/net/ieee80211.h
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-21 11:58:56 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-09-22 15:39:41 -0400
commite5658d3e8a347f4393a9403b0cec8d43fa6214b1 (patch)
treeae957738fa0a95a656e26b8ea48728b6c4267604 /include/net/ieee80211.h
parent31b59eaee8f8ec29d8cb6ac0c8eed086689d8030 (diff)
downloadop-kernel-dev-e5658d3e8a347f4393a9403b0cec8d43fa6214b1.zip
op-kernel-dev-e5658d3e8a347f4393a9403b0cec8d43fa6214b1.tar.gz
[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: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'include/net/ieee80211.h')
-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 220a9e3..4a381a0 100644
--- a/include/net/ieee80211.h
+++ b/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 {
OpenPOWER on IntegriCloud