Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Here's another round of updates for -next:
 * big A-MSDU RX performance improvement (avoid linearize of paged RX)
 * rfkill changes: cleanups, documentation, platform properties
 * basic PBSS support in cfg80211
 * MU-MIMO action frame processing support
 * BlockAck reordering & duplicate detection offload support
 * various cleanups & little fixes
====================

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

2 files changed, 16 insertions, 0 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 5b7b5ebe7ca8..5a30a7563633 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1727,6 +1727,8 @@ enum nl80211_commands {
  *      underlying device supports these minimal RRM features:
  *              %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
  *              %NL80211_FEATURE_QUIET,
+ *      Or, if global RRM is supported, see:
+ *              %NL80211_EXT_FEATURE_RRM
  *      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.
@@ -1789,6 +1791,10 @@ enum nl80211_commands {
  *      thus it must not specify the number of iterations, only the interval
  *      between scans. The scan plans are executed sequentially.
  *      Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
+ * @NL80211_ATTR_PBSS: flag attribute. If set it means operate
+ *      in a PBSS. Specified in %NL80211_CMD_CONNECT to request
+ *      connecting to a PCP, and in %NL80211_CMD_START_AP to start
+ *      a PCP instead of AP. Relevant for DMG networks only.
  *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
@@ -2164,6 +2170,8 @@ enum nl80211_attrs {
         NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
         NL80211_ATTR_SCHED_SCAN_PLANS,
 
+        NL80211_ATTR_PBSS,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -4396,12 +4404,18 @@ enum nl80211_feature_flags {
 /**
  * enum nl80211_ext_feature_index - bit index of extended features.
  * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
+ * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
+ *      can request to use RRM (see %NL80211_ATTR_USE_RRM) with
+ *      %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
+ *      the ASSOC_REQ_USE_RRM flag in the association request even if
+ *      NL80211_FEATURE_QUIET is not advertized.
  *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
 enum nl80211_ext_feature_index {
         NL80211_EXT_FEATURE_VHT_IBSS,
+        NL80211_EXT_FEATURE_RRM,
 
         /* add new features before the definition below */
         NUM_NL80211_EXT_FEATURES,
diff --git a/include/uapi/linux/rfkill.h b/include/uapi/linux/rfkill.h
index 058757f7a733..2e00dcebebd0 100644
--- a/include/uapi/linux/rfkill.h
+++ b/include/uapi/linux/rfkill.h
@@ -59,6 +59,8 @@ enum rfkill_type {
  * @RFKILL_OP_DEL: a device was removed
  * @RFKILL_OP_CHANGE: a device's state changed -- userspace changes one device
  * @RFKILL_OP_CHANGE_ALL: userspace changes all devices (of a type, or all)
+ *      into a state, also updating the default state used for devices that
+ *      are hot-plugged later.
  */
 enum rfkill_operation {
         RFKILL_OP_ADD = 0,