Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-09-22

Please pull this batch of updates intended for the 3.18 stream...

For the mac80211 bits, Johannes says:

"This time, I have some rate minstrel improvements, support for a very
small feature from CCX that Steinar reverse-engineered, dynamic ACK
timeout support, a number of changes for TDLS, early support for radio
resource measurement and many fixes. Also, I'm changing a number of
places to clear key memory when it's freed and Intel claims copyright
for code they developed."

For the bluetooth bits, Johan says:

"Here are some more patches intended for 3.18. Most of them are cleanups
or fixes for SMP. The only exception is a fix for BR/EDR L2CAP fixed
channels which should now work better together with the L2CAP
information request procedure."

For the iwlwifi bits, Emmanuel says:

"I fix here dvm which was broken by my last pull request. Arik
continues to work on TDLS and Luca solved a few issues in CT-Kill. Eyal
keeps digging into rate scaling code, more to come soon. Besides this,
nothing really special here."

Beyond that, there are the usual big batches of updates to ath9k, b43,
mwifiex, and wil6210 as well as a handful of other bits here and there.
Also, rtlwifi gets some btcoexist attention from Larry.

Please let me know if there are problems!
====================

Had to adjust the wil6210 code to comply with Joe Perches's recent
change in net-next to make the netdev_*() routines return void instead
of 'int'.

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

1 files changed, 100 insertions, 0 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index d097568da690..4b28dc07bcb1 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -722,6 +722,22 @@
  *      QoS mapping is relevant for IP packets, it is only valid during an
  *      association. This is cleared on disassociation and AP restart.
  *
+ * @NL80211_CMD_ADD_TX_TS: Ask the kernel to add a traffic stream for the given
+ *      %NL80211_ATTR_TSID and %NL80211_ATTR_MAC with %NL80211_ATTR_USER_PRIO
+ *      and %NL80211_ATTR_ADMITTED_TIME parameters.
+ *      Note that the action frame handshake with the AP shall be handled by
+ *      userspace via the normal management RX/TX framework, this only sets
+ *      up the TX TS in the driver/device.
+ *      If the admitted time attribute is not added then the request just checks
+ *      if a subsequent setup could be successful, the intent is to use this to
+ *      avoid setting up a session with the AP when local restrictions would
+ *      make that impossible. However, the subsequent "real" setup may still
+ *      fail even if the check was successful.
+ * @NL80211_CMD_DEL_TX_TS: Remove an existing TS with the %NL80211_ATTR_TSID
+ *      and %NL80211_ATTR_MAC parameters. It isn't necessary to call this
+ *      before removing a station entry entirely, or before disassociating
+ *      or similar, cleanup will happen in the driver/device in this case.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -893,6 +909,9 @@ enum nl80211_commands {
 
         NL80211_CMD_SET_QOS_MAP,
 
+        NL80211_CMD_ADD_TX_TS,
+        NL80211_CMD_DEL_TX_TS,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -1594,6 +1613,31 @@ enum nl80211_commands {
  * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
  *      the TDLS link initiator.
  *
+ * @NL80211_ATTR_USE_RRM: flag for indicating whether the current connection
+ *      shall support Radio Resource Measurements (11k). This attribute can be
+ *      used with %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests.
+ *      User space applications are expected to use this flag only if the
+ *      underlying device supports these minimal RRM features:
+ *              %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
+ *              %NL80211_FEATURE_QUIET,
+ *      If this flag is used, driver must add the Power Capabilities IE to the
+ *      association request. In addition, it must also set the RRM capability
+ *      flag in the association request's Capability Info field.
+ *
+ * @NL80211_ATTR_WIPHY_DYN_ACK: flag attribute used to enable ACK timeout
+ *      estimation algorithm (dynack). In order to activate dynack
+ *      %NL80211_FEATURE_ACKTO_ESTIMATION feature flag must be set by lower
+ *      drivers to indicate dynack capability. Dynack is automatically disabled
+ *      setting valid value for coverage class.
+ *
+ * @NL80211_ATTR_TSID: a TSID value (u8 attribute)
+ * @NL80211_ATTR_USER_PRIO: user priority value (u8 attribute)
+ * @NL80211_ATTR_ADMITTED_TIME: admitted time in units of 32 microseconds
+ *      (per second) (u16 attribute)
+ *
+ * @NL80211_ATTR_SMPS_MODE: SMPS mode to use (ap mode). see
+ *      &enum nl80211_smps_mode.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1936,6 +1980,16 @@ enum nl80211_attrs {
 
         NL80211_ATTR_TDLS_INITIATOR,
 
+        NL80211_ATTR_USE_RRM,
+
+        NL80211_ATTR_WIPHY_DYN_ACK,
+
+        NL80211_ATTR_TSID,
+        NL80211_ATTR_USER_PRIO,
+        NL80211_ATTR_ADMITTED_TIME,
+
+        NL80211_ATTR_SMPS_MODE,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -3968,6 +4022,26 @@ enum nl80211_ap_sme_features {
  * @NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE: This driver supports dynamic
  *      channel bandwidth change (e.g., HT 20 <-> 40 MHz channel) during the
  *      lifetime of a BSS.
+ * @NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES: This device adds a DS Parameter
+ *      Set IE to probe requests.
+ * @NL80211_FEATURE_WFA_TPC_IE_IN_PROBES: This device adds a WFA TPC Report IE
+ *      to probe requests.
+ * @NL80211_FEATURE_QUIET: This device, in client mode, supports Quiet Period
+ *      requests sent to it by an AP.
+ * @NL80211_FEATURE_TX_POWER_INSERTION: This device is capable of inserting the
+ *      current tx power value into the TPC Report IE in the spectrum
+ *      management TPC Report action frame, and in the Radio Measurement Link
+ *      Measurement Report action frame.
+ * @NL80211_FEATURE_ACKTO_ESTIMATION: This driver supports dynamic ACK timeout
+ *      estimation (dynack). %NL80211_ATTR_WIPHY_DYN_ACK flag attribute is used
+ *      to enable dynack.
+ * @NL80211_FEATURE_STATIC_SMPS: Device supports static spatial
+ *      multiplexing powersave, ie. can turn off all but one chain
+ *      even on HT connections that should be using more chains.
+ * @NL80211_FEATURE_DYNAMIC_SMPS: Device supports dynamic spatial
+ *      multiplexing powersave, ie. can turn off all but one chain
+ *      and then wake the rest up as required after, for example,
+ *      rts/cts handshake.
  */
 enum nl80211_feature_flags {
         NL80211_FEATURE_SK_TX_STATUS                    = 1 << 0,
@@ -3989,6 +4063,13 @@ enum nl80211_feature_flags {
         NL80211_FEATURE_USERSPACE_MPM                   = 1 << 16,
         NL80211_FEATURE_ACTIVE_MONITOR                  = 1 << 17,
         NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE       = 1 << 18,
+        NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES       = 1 << 19,
+        NL80211_FEATURE_WFA_TPC_IE_IN_PROBES            = 1 << 20,
+        NL80211_FEATURE_QUIET                           = 1 << 21,
+        NL80211_FEATURE_TX_POWER_INSERTION              = 1 << 22,
+        NL80211_FEATURE_ACKTO_ESTIMATION                = 1 << 23,
+        NL80211_FEATURE_STATIC_SMPS                     = 1 << 24,
+        NL80211_FEATURE_DYNAMIC_SMPS                    = 1 << 25,
 };
 
 /**
@@ -4063,6 +4144,25 @@ enum nl80211_acl_policy {
 };
 
 /**
+ * enum nl80211_smps_mode - SMPS mode
+ *
+ * Requested SMPS mode (for AP mode)
+ *
+ * @NL80211_SMPS_OFF: SMPS off (use all antennas).
+ * @NL80211_SMPS_STATIC: static SMPS (use a single antenna)
+ * @NL80211_SMPS_DYNAMIC: dynamic smps (start with a single antenna and
+ *      turn on other antennas after CTS/RTS).
+ */
+enum nl80211_smps_mode {
+        NL80211_SMPS_OFF,
+        NL80211_SMPS_STATIC,
+        NL80211_SMPS_DYNAMIC,
+
+        __NL80211_SMPS_AFTER_LAST,
+        NL80211_SMPS_MAX = __NL80211_SMPS_AFTER_LAST - 1
+};
+
+/**
  * enum nl80211_radar_event - type of radar event for DFS operation
  *
  * Type of event to be used with NL80211_ATTR_RADAR_EVENT to inform userspace