Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

[cascardo/linux.git] / include / linux / ieee80211.h

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index f27d11a..0b5e03e 100644 (file)
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -113,7 +113,7 @@ struct ieee80211_hdr {
 struct ieee80211s_hdr {
        u8 flags;
        u8 ttl;
-       u8 seqnum[3];
+       __le32 seqnum;
        u8 eaddr1[6];
        u8 eaddr2[6];
        u8 eaddr3[6];
@@ -465,13 +465,19 @@ enum ieee80211_eid {
        WLAN_EID_TS_DELAY = 43,
        WLAN_EID_TCLAS_PROCESSING = 44,
        WLAN_EID_QOS_CAPA = 46,
-       /* 802.11s */
-       WLAN_EID_MESH_CONFIG = 36,      /* Pending IEEE 802.11 ANA approval */
-       WLAN_EID_MESH_ID = 37,          /* Pending IEEE 802.11 ANA approval */
-       WLAN_EID_PEER_LINK = 40,        /* Pending IEEE 802.11 ANA approval */
-       WLAN_EID_PREQ = 53,             /* Pending IEEE 802.11 ANA approval */
-       WLAN_EID_PREP = 54,             /* Pending IEEE 802.11 ANA approval */
-       WLAN_EID_PERR = 55,             /* Pending IEEE 802.11 ANA approval */
+       /* 802.11s
+        *
+        * All mesh EID numbers are pending IEEE 802.11 ANA approval.
+        * The numbers have been incremented from those suggested in
+        * 802.11s/D2.0 so that MESH_CONFIG does not conflict with
+        * EXT_SUPP_RATES.
+        */
+       WLAN_EID_MESH_CONFIG = 51,
+       WLAN_EID_MESH_ID = 52,
+       WLAN_EID_PEER_LINK = 55,
+       WLAN_EID_PREQ = 68,
+       WLAN_EID_PREP = 69,
+       WLAN_EID_PERR = 70,
        /* 802.11h */
        WLAN_EID_PWR_CONSTRAINT = 32,
        WLAN_EID_PWR_CAPABILITY = 33,