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, 47 insertions, 5 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 91054fd660e0..a12e6cae5132 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -418,8 +418,18 @@
  *      %NL80211_ATTR_SSID attribute, and can optionally specify the association
  *      IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
  *      %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
- *      %NL80211_ATTR_CONTROL_PORT_ETHERTYPE and
- *      %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT.
+ *      %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
+ *      %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and
+ *      %NL80211_ATTR_WIPHY_FREQ_HINT.
+ *      If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
+ *      restrictions on BSS selection, i.e., they effectively prevent roaming
+ *      within the ESS. %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT
+ *      can be included to provide a recommendation of the initial BSS while
+ *      allowing the driver to roam to other BSSes within the ESS and also to
+ *      ignore this recommendation if the indicated BSS is not ideal. Only one
+ *      set of BSSID,frequency parameters is used (i.e., either the enforcing
+ *      %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
+ *      %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
  *      Background scan period can optionally be
  *      specified in %NL80211_ATTR_BG_SCAN_PERIOD,
  *      if not specified default background scan configuration
@@ -1555,6 +1565,16 @@ enum nl80211_commands {
  *      data is in the format defined for the payload of the QoS Map Set element
  *      in IEEE Std 802.11-2012, 8.4.2.97.
  *
+ * @NL80211_ATTR_MAC_HINT: MAC address recommendation as initial BSS
+ * @NL80211_ATTR_WIPHY_FREQ_HINT: frequency of the recommended initial BSS
+ *
+ * @NL80211_ATTR_MAX_AP_ASSOC_STA: Device attribute that indicates how many
+ *      associated stations are supported in AP mode (including P2P GO); u32.
+ *      Since drivers may not have a fixed limit on the maximum number (e.g.,
+ *      other concurrent operations may affect this), drivers are allowed to
+ *      advertise values that cannot always be met. In such cases, an attempt
+ *      to add a new station entry with @NL80211_CMD_NEW_STATION may fail.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1883,6 +1903,11 @@ enum nl80211_attrs {
 
         NL80211_ATTR_QOS_MAP,
 
+        NL80211_ATTR_MAC_HINT,
+        NL80211_ATTR_WIPHY_FREQ_HINT,
+
+        NL80211_ATTR_MAX_AP_ASSOC_STA,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -2412,7 +2437,10 @@ enum nl80211_reg_type {
  *      in KHz. This is not a center a frequency but an actual regulatory
  *      band edge.
  * @NL80211_ATTR_FREQ_RANGE_MAX_BW: maximum allowed bandwidth for this
- *      frequency range, in KHz.
+ *      frequency range, in KHz. If not present or 0, maximum available
+ *      bandwidth should be calculated base on contiguous rules and wider
+ *      channels will be allowed to cross multiple contiguous/overlapping
+ *      frequency ranges.
  * @NL80211_ATTR_POWER_RULE_MAX_ANT_GAIN: the maximum allowed antenna gain
  *      for a given frequency range. The value is in mBi (100 * dBi).
  *      If you don't have one then don't send this.
@@ -2442,9 +2470,15 @@ enum nl80211_reg_rule_attr {
  * enum nl80211_sched_scan_match_attr - scheduled scan match attributes
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
  * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
- * only report BSS with matching SSID.
+ *      only report BSS with matching SSID.
  * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
- *      BSS in scan results. Filtering is turned off if not specified.
+ *      BSS in scan results. Filtering is turned off if not specified. Note that
+ *      if this attribute is in a match set of its own, then it is treated as
+ *      the default value for all matchsets with an SSID, rather than being a
+ *      matchset of its own without an RSSI filter. This is due to problems with
+ *      how this API was implemented in the past. Also, due to the same problem,
+ *      the only way to create a matchset with only an RSSI filter (with this
+ *      attribute) is if there's only a single matchset with the RSSI attribute.
  * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
  *      attribute number currently defined
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
@@ -3131,6 +3165,7 @@ enum nl80211_key_attributes {
  *      in an array of MCS numbers.
  * @NL80211_TXRATE_VHT: VHT rates allowed for TX rate selection,
  *      see &struct nl80211_txrate_vht
+ * @NL80211_TXRATE_GI: configure GI, see &enum nl80211_txrate_gi
  * @__NL80211_TXRATE_AFTER_LAST: internal
  * @NL80211_TXRATE_MAX: highest TX rate attribute
  */
@@ -3139,6 +3174,7 @@ enum nl80211_tx_rate_attributes {
         NL80211_TXRATE_LEGACY,
         NL80211_TXRATE_HT,
         NL80211_TXRATE_VHT,
+        NL80211_TXRATE_GI,
 
         /* keep last */
         __NL80211_TXRATE_AFTER_LAST,
@@ -3156,6 +3192,12 @@ struct nl80211_txrate_vht {
         __u16 mcs[NL80211_VHT_NSS_MAX];
 };
 
+enum nl80211_txrate_gi {
+        NL80211_TXRATE_DEFAULT_GI,
+        NL80211_TXRATE_FORCE_SGI,
+        NL80211_TXRATE_FORCE_LGI,
+};
+
 /**
  * enum nl80211_band - Frequency band
  * @NL80211_BAND_2GHZ: 2.4 GHz ISM band