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

John W. Linville says:

====================
Please pull this batch of wireless updates intended for the 3.15
stream!

For the mac80211 bits, Johannes says:

"We have some cleanups and minor fixes as well as userspace API
improvements from a lot of people, extended VHT support for radiotap
from Emmanuel, CSA improvements from Andrei, Luca and Michal. I've also
included my work on hwsim to make dynamic registration of radios
possible."

Along with that, we get the usual round of updates to ath9k,
brcmfmac, mwifiex, wcn36xx, and the ti drivers -- nothing particularly
noteworthy, mostly just random updates and refactoring.

Also included is a pull of the wireless tree, intended to resolve
some potential merge issues.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 133 insertions, 66 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index e526a8cecb70..5f349355ee54 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -597,6 +597,20 @@ static inline int ieee80211_is_qos_nullfunc(__le16 fc)
 }
 
 /**
+ * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
+ * @fc: frame control field in little-endian byteorder
+ */
+static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
+{
+        /* IEEE 802.11-2012, definition of "bufferable management frame";
+         * note that this ignores the IBSS special case. */
+        return ieee80211_is_mgmt(fc) &&
+               (ieee80211_is_action(fc) ||
+                ieee80211_is_disassoc(fc) ||
+                ieee80211_is_deauth(fc));
+}
+
+/**
  * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
  * @seq_ctrl: frame sequence control bytes in little-endian byteorder
  */
@@ -1636,51 +1650,22 @@ enum ieee80211_reasoncode {
 enum ieee80211_eid {
         WLAN_EID_SSID = 0,
         WLAN_EID_SUPP_RATES = 1,
-        WLAN_EID_FH_PARAMS = 2,
+        WLAN_EID_FH_PARAMS = 2, /* reserved now */
         WLAN_EID_DS_PARAMS = 3,
         WLAN_EID_CF_PARAMS = 4,
         WLAN_EID_TIM = 5,
         WLAN_EID_IBSS_PARAMS = 6,
-        WLAN_EID_CHALLENGE = 16,
-
         WLAN_EID_COUNTRY = 7,
         WLAN_EID_HP_PARAMS = 8,
         WLAN_EID_HP_TABLE = 9,
         WLAN_EID_REQUEST = 10,
-
         WLAN_EID_QBSS_LOAD = 11,
         WLAN_EID_EDCA_PARAM_SET = 12,
         WLAN_EID_TSPEC = 13,
         WLAN_EID_TCLAS = 14,
         WLAN_EID_SCHEDULE = 15,
-        WLAN_EID_TS_DELAY = 43,
-        WLAN_EID_TCLAS_PROCESSING = 44,
-        WLAN_EID_QOS_CAPA = 46,
-        /* 802.11z */
-        WLAN_EID_LINK_ID = 101,
-        /* 802.11s */
-        WLAN_EID_MESH_CONFIG = 113,
-        WLAN_EID_MESH_ID = 114,
-        WLAN_EID_LINK_METRIC_REPORT = 115,
-        WLAN_EID_CONGESTION_NOTIFICATION = 116,
-        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_CHALLENGE = 16,
+        /* 17-31 reserved for challenge text extension */
         WLAN_EID_PWR_CONSTRAINT = 32,
         WLAN_EID_PWR_CAPABILITY = 33,
         WLAN_EID_TPC_REQUEST = 34,
@@ -1691,66 +1676,114 @@ enum ieee80211_eid {
         WLAN_EID_MEASURE_REPORT = 39,
         WLAN_EID_QUIET = 40,
         WLAN_EID_IBSS_DFS = 41,
-
         WLAN_EID_ERP_INFO = 42,
-        WLAN_EID_EXT_SUPP_RATES = 50,
-
+        WLAN_EID_TS_DELAY = 43,
+        WLAN_EID_TCLAS_PROCESSING = 44,
         WLAN_EID_HT_CAPABILITY = 45,
-        WLAN_EID_HT_OPERATION = 61,
-        WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
-
+        WLAN_EID_QOS_CAPA = 46,
+        /* 47 reserved for Broadcom */
         WLAN_EID_RSN = 48,
-        WLAN_EID_MMIE = 76,
-        WLAN_EID_VENDOR_SPECIFIC = 221,
-        WLAN_EID_QOS_PARAMETER = 222,
-
+        WLAN_EID_802_15_COEX = 49,
+        WLAN_EID_EXT_SUPP_RATES = 50,
         WLAN_EID_AP_CHAN_REPORT = 51,
         WLAN_EID_NEIGHBOR_REPORT = 52,
         WLAN_EID_RCPI = 53,
+        WLAN_EID_MOBILITY_DOMAIN = 54,
+        WLAN_EID_FAST_BSS_TRANSITION = 55,
+        WLAN_EID_TIMEOUT_INTERVAL = 56,
+        WLAN_EID_RIC_DATA = 57,
+        WLAN_EID_DSE_REGISTERED_LOCATION = 58,
+        WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
+        WLAN_EID_EXT_CHANSWITCH_ANN = 60,
+        WLAN_EID_HT_OPERATION = 61,
+        WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
         WLAN_EID_BSS_AVG_ACCESS_DELAY = 63,
         WLAN_EID_ANTENNA_INFO = 64,
         WLAN_EID_RSNI = 65,
         WLAN_EID_MEASUREMENT_PILOT_TX_INFO = 66,
         WLAN_EID_BSS_AVAILABLE_CAPACITY = 67,
         WLAN_EID_BSS_AC_ACCESS_DELAY = 68,
+        WLAN_EID_TIME_ADVERTISEMENT = 69,
         WLAN_EID_RRM_ENABLED_CAPABILITIES = 70,
         WLAN_EID_MULTIPLE_BSSID = 71,
         WLAN_EID_BSS_COEX_2040 = 72,
         WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74,
-        WLAN_EID_EXT_CAPABILITY = 127,
-
-        WLAN_EID_MOBILITY_DOMAIN = 54,
-        WLAN_EID_FAST_BSS_TRANSITION = 55,
-        WLAN_EID_TIMEOUT_INTERVAL = 56,
-        WLAN_EID_RIC_DATA = 57,
         WLAN_EID_RIC_DESCRIPTOR = 75,
-
-        WLAN_EID_DSE_REGISTERED_LOCATION = 58,
-        WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
-        WLAN_EID_EXT_CHANSWITCH_ANN = 60,
-
-        WLAN_EID_VHT_CAPABILITY = 191,
-        WLAN_EID_VHT_OPERATION = 192,
-        WLAN_EID_OPMODE_NOTIF = 199,
-        WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
-        WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
-        WLAN_EID_EXTENDED_BSS_LOAD = 193,
-        WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
-        WLAN_EID_AID = 197,
-        WLAN_EID_QUIET_CHANNEL = 198,
-
-        /* 802.11ad */
+        WLAN_EID_MMIE = 76,
+        WLAN_EID_ASSOC_COMEBACK_TIME = 77,
+        WLAN_EID_EVENT_REQUEST = 78,
+        WLAN_EID_EVENT_REPORT = 79,
+        WLAN_EID_DIAGNOSTIC_REQUEST = 80,
+        WLAN_EID_DIAGNOSTIC_REPORT = 81,
+        WLAN_EID_LOCATION_PARAMS = 82,
         WLAN_EID_NON_TX_BSSID_CAP =  83,
+        WLAN_EID_SSID_LIST = 84,
+        WLAN_EID_MULTI_BSSID_IDX = 85,
+        WLAN_EID_FMS_DESCRIPTOR = 86,
+        WLAN_EID_FMS_REQUEST = 87,
+        WLAN_EID_FMS_RESPONSE = 88,
+        WLAN_EID_QOS_TRAFFIC_CAPA = 89,
+        WLAN_EID_BSS_MAX_IDLE_PERIOD = 90,
+        WLAN_EID_TSF_REQUEST = 91,
+        WLAN_EID_TSF_RESPOSNE = 92,
+        WLAN_EID_WNM_SLEEP_MODE = 93,
+        WLAN_EID_TIM_BCAST_REQ = 94,
+        WLAN_EID_TIM_BCAST_RESP = 95,
+        WLAN_EID_COLL_IF_REPORT = 96,
+        WLAN_EID_CHANNEL_USAGE = 97,
+        WLAN_EID_TIME_ZONE = 98,
+        WLAN_EID_DMS_REQUEST = 99,
+        WLAN_EID_DMS_RESPONSE = 100,
+        WLAN_EID_LINK_ID = 101,
+        WLAN_EID_WAKEUP_SCHEDUL = 102,
+        /* 103 reserved */
+        WLAN_EID_CHAN_SWITCH_TIMING = 104,
+        WLAN_EID_PTI_CONTROL = 105,
+        WLAN_EID_PU_BUFFER_STATUS = 106,
+        WLAN_EID_INTERWORKING = 107,
+        WLAN_EID_ADVERTISEMENT_PROTOCOL = 108,
+        WLAN_EID_EXPEDITED_BW_REQ = 109,
+        WLAN_EID_QOS_MAP_SET = 110,
+        WLAN_EID_ROAMING_CONSORTIUM = 111,
+        WLAN_EID_EMERGENCY_ALERT = 112,
+        WLAN_EID_MESH_CONFIG = 113,
+        WLAN_EID_MESH_ID = 114,
+        WLAN_EID_LINK_METRIC_REPORT = 115,
+        WLAN_EID_CONGESTION_NOTIFICATION = 116,
+        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_EXT_CAPABILITY = 127,
+        /* 128, 129 reserved for Agere */
+        WLAN_EID_PREQ = 130,
+        WLAN_EID_PREP = 131,
+        WLAN_EID_PERR = 132,
+        /* 133-136 reserved for Cisco */
+        WLAN_EID_PXU = 137,
+        WLAN_EID_PXUC = 138,
+        WLAN_EID_AUTH_MESH_PEER_EXCH = 139,
+        WLAN_EID_MIC = 140,
+        WLAN_EID_DESTINATION_URI = 141,
+        WLAN_EID_UAPSD_COEX = 142,
         WLAN_EID_WAKEUP_SCHEDULE = 143,
         WLAN_EID_EXT_SCHEDULE = 144,
         WLAN_EID_STA_AVAILABILITY = 145,
         WLAN_EID_DMG_TSPEC = 146,
         WLAN_EID_DMG_AT = 147,
         WLAN_EID_DMG_CAP = 148,
+        /* 149-150 reserved for Cisco */
         WLAN_EID_DMG_OPERATION = 151,
         WLAN_EID_DMG_BSS_PARAM_CHANGE = 152,
         WLAN_EID_DMG_BEAM_REFINEMENT = 153,
         WLAN_EID_CHANNEL_MEASURE_FEEDBACK = 154,
+        /* 155-156 reserved for Cisco */
         WLAN_EID_AWAKE_WINDOW = 157,
         WLAN_EID_MULTI_BAND = 158,
         WLAN_EID_ADDBA_EXT = 159,
@@ -1767,11 +1800,34 @@ enum ieee80211_eid {
         WLAN_EID_MULTIPLE_MAC_ADDR = 170,
         WLAN_EID_U_PID = 171,
         WLAN_EID_DMG_LINK_ADAPT_ACK = 172,
+        /* 173 reserved for Symbol */
+        WLAN_EID_MCCAOP_ADV_OVERVIEW = 174,
         WLAN_EID_QUIET_PERIOD_REQ = 175,
+        /* 176 reserved for Symbol */
         WLAN_EID_QUIET_PERIOD_RESP = 177,
+        /* 178-179 reserved for Symbol */
+        /* 180 reserved for ISO/IEC 20011 */
         WLAN_EID_EPAC_POLICY = 182,
         WLAN_EID_CLISTER_TIME_OFF = 183,
+        WLAN_EID_INTER_AC_PRIO = 184,
+        WLAN_EID_SCS_DESCRIPTOR = 185,
+        WLAN_EID_QLOAD_REPORT = 186,
+        WLAN_EID_HCCA_TXOP_UPDATE_COUNT = 187,
+        WLAN_EID_HL_STREAM_ID = 188,
+        WLAN_EID_GCR_GROUP_ADDR = 189,
         WLAN_EID_ANTENNA_SECTOR_ID_PATTERN = 190,
+        WLAN_EID_VHT_CAPABILITY = 191,
+        WLAN_EID_VHT_OPERATION = 192,
+        WLAN_EID_EXTENDED_BSS_LOAD = 193,
+        WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
+        WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
+        WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
+        WLAN_EID_AID = 197,
+        WLAN_EID_QUIET_CHANNEL = 198,
+        WLAN_EID_OPMODE_NOTIF = 199,
+
+        WLAN_EID_VENDOR_SPECIFIC = 221,
+        WLAN_EID_QOS_PARAMETER = 222,
 };
 
 /* Action category code */
@@ -2192,10 +2248,10 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)
 }
 
 /**
- * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
+ * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
  * @hdr: the frame (buffer must include at least the first octet of payload)
  */
-static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
+static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
 {
         if (ieee80211_is_disassoc(hdr->frame_control) ||
             ieee80211_is_deauth(hdr->frame_control))
@@ -2224,6 +2280,17 @@ static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
 }
 
 /**
+ * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
+ * @skb: the skb containing the frame, length will be checked
+ */
+static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
+{
+        if (skb->len < 25)
+                return false;
+        return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
+}
+
+/**
  * ieee80211_is_public_action - check if frame is a public action frame
  * @hdr: the frame
  * @len: length of the frame