Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

3 files changed, 72 insertions, 16 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 97b2eae6a22c..ed5a03cbe184 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -986,6 +986,7 @@ struct ieee80211_ht_info {
 #define WLAN_AUTH_OPEN 0
 #define WLAN_AUTH_SHARED_KEY 1
 #define WLAN_AUTH_FT 2
+#define WLAN_AUTH_SAE 3
 #define WLAN_AUTH_LEAP 128
 
 #define WLAN_AUTH_CHALLENGE_LEN 128
@@ -1072,6 +1073,10 @@ enum ieee80211_statuscode {
         WLAN_STATUS_NO_DIRECT_LINK = 48,
         WLAN_STATUS_STA_NOT_PRESENT = 49,
         WLAN_STATUS_STA_NOT_QSTA = 50,
+        /* 802.11s */
+        WLAN_STATUS_ANTI_CLOG_REQUIRED = 76,
+        WLAN_STATUS_FCG_NOT_SUPP = 78,
+        WLAN_STATUS_STA_NO_TBTT = 78,
 };
 
 
@@ -1112,6 +1117,22 @@ enum ieee80211_reasoncode {
         WLAN_REASON_QSTA_REQUIRE_SETUP = 38,
         WLAN_REASON_QSTA_TIMEOUT = 39,
         WLAN_REASON_QSTA_CIPHER_NOT_SUPP = 45,
+        /* 802.11s */
+        WLAN_REASON_MESH_PEER_CANCELED = 52,
+        WLAN_REASON_MESH_MAX_PEERS = 53,
+        WLAN_REASON_MESH_CONFIG = 54,
+        WLAN_REASON_MESH_CLOSE = 55,
+        WLAN_REASON_MESH_MAX_RETRIES = 56,
+        WLAN_REASON_MESH_CONFIRM_TIMEOUT = 57,
+        WLAN_REASON_MESH_INVALID_GTK = 58,
+        WLAN_REASON_MESH_INCONSISTENT_PARAM = 59,
+        WLAN_REASON_MESH_INVALID_SECURITY = 60,
+        WLAN_REASON_MESH_PATH_ERROR = 61,
+        WLAN_REASON_MESH_PATH_NOFORWARD = 62,
+        WLAN_REASON_MESH_PATH_DEST_UNREACHABLE = 63,
+        WLAN_REASON_MAC_EXISTS_IN_MBSS = 64,
+        WLAN_REASON_MESH_CHAN_REGULATORY = 65,
+        WLAN_REASON_MESH_CHAN = 66,
 };
 
 
@@ -1139,20 +1160,33 @@ enum ieee80211_eid {
         WLAN_EID_TS_DELAY = 43,
         WLAN_EID_TCLAS_PROCESSING = 44,
         WLAN_EID_QOS_CAPA = 46,
-        /* 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.
+        /* 802.11s */
+        WLAN_EID_MESH_CONFIG = 113,
+        WLAN_EID_MESH_ID = 114,
+        WLAN_EID_LINK_METRIC_REPORT = 115,
+        WLAN_EID_CONGESTION_NOTIFICATION = 116,
+        /* Note that the Peer Link IE has been replaced with the similar
+         * Peer Management IE.  We will keep the former definition until mesh
+         * code is changed to comply with latest 802.11s drafts.
          */
-        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,
-        WLAN_EID_RANN = 49,     /* compatible with FreeBSD */
+        WLAN_EID_PEER_LINK = 55,  /* no longer in 802.11s drafts */
+        WLAN_EID_PEER_MGMT = 117,
+        WLAN_EID_CHAN_SWITCH_PARAM = 118,
+        WLAN_EID_MESH_AWAKE_WINDOW = 119,
+        WLAN_EID_BEACON_TIMING = 120,
+        WLAN_EID_MCCAOP_SETUP_REQ = 121,
+        WLAN_EID_MCCAOP_SETUP_RESP = 122,
+        WLAN_EID_MCCAOP_ADVERT = 123,
+        WLAN_EID_MCCAOP_TEARDOWN = 124,
+        WLAN_EID_GANN = 125,
+        WLAN_EID_RANN = 126,
+        WLAN_EID_PREQ = 130,
+        WLAN_EID_PREP = 131,
+        WLAN_EID_PERR = 132,
+        WLAN_EID_PXU = 137,
+        WLAN_EID_PXUC = 138,
+        WLAN_EID_AUTH_MESH_PEER_EXCH = 139,
+        WLAN_EID_MIC = 140,
 
         WLAN_EID_PWR_CONSTRAINT = 32,
         WLAN_EID_PWR_CAPABILITY = 33,
@@ -1211,9 +1245,14 @@ enum ieee80211_category {
         WLAN_CATEGORY_HT = 7,
         WLAN_CATEGORY_SA_QUERY = 8,
         WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION = 9,
+        WLAN_CATEGORY_MESH_ACTION = 13,
+        WLAN_CATEGORY_MULTIHOP_ACTION = 14,
+        WLAN_CATEGORY_SELF_PROTECTED = 15,
         WLAN_CATEGORY_WMM = 17,
-        WLAN_CATEGORY_MESH_PLINK = 30,          /* Pending ANA approval */
-        WLAN_CATEGORY_MESH_PATH_SEL = 32,       /* Pending ANA approval */
+        /* TODO: remove MESH_PLINK and MESH_PATH_SEL after */
+        /*       mesh is updated to current 802.11s draft  */
+        WLAN_CATEGORY_MESH_PLINK = 30,
+        WLAN_CATEGORY_MESH_PATH_SEL = 32,
         WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126,
         WLAN_CATEGORY_VENDOR_SPECIFIC = 127,
 };
@@ -1351,6 +1390,8 @@ enum ieee80211_sa_query_action {
 /* AKM suite selectors */
 #define WLAN_AKM_SUITE_8021X            0x000FAC01
 #define WLAN_AKM_SUITE_PSK              0x000FAC02
+#define WLAN_AKM_SUITE_SAE                      0x000FAC08
+#define WLAN_AKM_SUITE_FT_OVER_SAE      0x000FAC09
 
 #define WLAN_MAX_KEY_LEN                32
 
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index c08709fe36fc..0edb2566c14c 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -1413,6 +1413,16 @@ enum nl80211_reg_rule_flags {
  * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
  * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
  * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio
+ *      spent on this channel
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary
+ *      channel was sensed busy (either due to activity or energy detect)
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension
+ *      channel was sensed busy
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent
+ *      receiving data
+ * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent
+ *      transmitting data
  * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
  *      currently defined
  * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
@@ -1422,6 +1432,11 @@ enum nl80211_survey_info {
         NL80211_SURVEY_INFO_FREQUENCY,
         NL80211_SURVEY_INFO_NOISE,
         NL80211_SURVEY_INFO_IN_USE,
+        NL80211_SURVEY_INFO_CHANNEL_TIME,
+        NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY,
+        NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY,
+        NL80211_SURVEY_INFO_CHANNEL_TIME_RX,
+        NL80211_SURVEY_INFO_CHANNEL_TIME_TX,
 
         /* keep last */
         __NL80211_SURVEY_INFO_AFTER_LAST,
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index e6827eedf18b..4395b28bb86c 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1157,6 +1157,6 @@ struct __compat_iw_event {
 #define IW_EV_PARAM_PK_LEN      (IW_EV_LCP_PK_LEN + sizeof(struct iw_param))
 #define IW_EV_ADDR_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct sockaddr))
 #define IW_EV_QUAL_PK_LEN       (IW_EV_LCP_PK_LEN + sizeof(struct iw_quality))
-#define IW_EV_POINT_PK_LEN      (IW_EV_LCP_LEN + 4)
+#define IW_EV_POINT_PK_LEN      (IW_EV_LCP_PK_LEN + 4)
 
 #endif  /* _LINUX_WIRELESS_H */