cfg80211: Pass station (extended) capability info to kernel

The information of the peer's capabilities and extended capabilities are
required for the driver to perform TDLS Peer UAPSD operations and off
channel operations. This information of the peer is passed from user space
using NL80211_CMD_SET_STATION command. This commit enhances
the function nl80211_set_station to pass the capability information of
the peer to the driver.

Similarly, there may be need for capability information for other modes,
so allow this to be provided with both add_station and change_station.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index a229046d86d456265f5dfc0830c85dd5102716f9..fa2612952c192dacd0b0ca3bcc95d4fd97317aef 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -626,12 +626,14 @@ enum plink_actions {
 /**
  * enum station_parameters_apply_mask - station parameter values to apply
  * @STATION_PARAM_APPLY_UAPSD: apply new uAPSD parameters (uapsd_queues, max_sp)
+ * @STATION_PARAM_APPLY_CAPABILITY: apply new capability
  *
  * Not all station parameters have in-band "no change" signalling,
  * for those that don't these flags will are used.
  */
 enum station_parameters_apply_mask {
        STATION_PARAM_APPLY_UAPSD = BIT(0),
+       STATION_PARAM_APPLY_CAPABILITY = BIT(1),
 };
 
 /**
@@ -662,6 +664,9 @@ enum station_parameters_apply_mask {
  *     see &enum station_parameters_apply_mask
  * @local_pm: local link-specific mesh power save mode (no change when set
  *     to unknown)
+ * @capability: station capability
+ * @ext_capab: extended capabilities of the station
+ * @ext_capab_len: number of extended capabilities
  */
 struct station_parameters {
        u8 *supported_rates;
@@ -678,6 +683,9 @@ struct station_parameters {
        u8 uapsd_queues;
        u8 max_sp;
        enum nl80211_mesh_power_mode local_pm;
+       u16 capability;
+       u8 *ext_capab;
+       u8 ext_capab_len;
 };
 
 /**

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 1fd6e561189671b9cd4c7382c568ec0c032ed29f..f7c35ca01efc58353856c238a6f90b9fd348af1c 100644 (file)
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1361,6 +1361,13 @@ enum nl80211_commands {
  * @NL80211_ATTR_EXT_CAPA_MASK: Extended capabilities that the kernel driver
  *     has set in the %NL80211_ATTR_EXT_CAPA value, for multibit fields.
  *
+ * @NL80211_ATTR_STA_CAPABILITY: Station capabilities (u16) are advertised to
+ *     the driver, e.g., to enable TDLS power save (PU-APSD).
+ *
+ * @NL80211_ATTR_STA_EXT_CAPABILITY: Station extended capabilities are
+ *     advertised to the driver, e.g., to enable TDLS off channel operations
+ *     and PU-APSD.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1644,6 +1651,9 @@ enum nl80211_attrs {
        NL80211_ATTR_EXT_CAPA,
        NL80211_ATTR_EXT_CAPA_MASK,
 
+       NL80211_ATTR_STA_CAPABILITY,
+       NL80211_ATTR_STA_EXT_CAPABILITY,
+
        /* add attributes here, update the policy in nl80211.c */
 
        __NL80211_ATTR_AFTER_LAST,

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 1237431c3efae58582b2a811fd52c7a0a1883b83..be9f2b5a403f19c209dbeab6eb89d557d72384ac 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -368,6 +368,8 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
        [NL80211_ATTR_P2P_OPPPS] = { .type = NLA_U8 },
        [NL80211_ATTR_ACL_POLICY] = {. type = NLA_U32 },
        [NL80211_ATTR_MAC_ADDRS] = { .type = NLA_NESTED },
+       [NL80211_ATTR_STA_CAPABILITY] = { .type = NLA_U16 },
+       [NL80211_ATTR_STA_EXT_CAPABILITY] = { .type = NLA_BINARY, },
 };
 
 /* policy for the key attributes */
@@ -3435,6 +3437,19 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                        nla_len(info->attrs[NL80211_ATTR_STA_SUPPORTED_RATES]);
        }
 
+       if (info->attrs[NL80211_ATTR_STA_CAPABILITY]) {
+               params.capability =
+                       nla_get_u16(info->attrs[NL80211_ATTR_STA_CAPABILITY]);
+               params.sta_modify_mask |= STATION_PARAM_APPLY_CAPABILITY;
+       }
+
+       if (info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY]) {
+               params.ext_capab =
+                       nla_data(info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY]);
+               params.ext_capab_len =
+                       nla_len(info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY]);
+       }
+
        if (info->attrs[NL80211_ATTR_STA_LISTEN_INTERVAL] ||
            info->attrs[NL80211_ATTR_HT_CAPABILITY])
                return -EINVAL;
@@ -3505,6 +3520,10 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                /* reject other things that can't change */
                if (params.supported_rates)
                        return -EINVAL;
+               if (info->attrs[NL80211_ATTR_STA_CAPABILITY])
+                       return -EINVAL;
+               if (info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY])
+                       return -EINVAL;
 
                /* must be last in here for error handling */
                params.vlan = get_vlan(info, rdev);
@@ -3537,6 +3556,10 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info)
                        return -EINVAL;
                if (params.supported_rates)
                        return -EINVAL;
+               if (info->attrs[NL80211_ATTR_STA_CAPABILITY])
+                       return -EINVAL;
+               if (info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY])
+                       return -EINVAL;
                /*
                 * No special handling for TDLS here -- the userspace
                 * mesh code doesn't have this bug.
@@ -3601,6 +3624,19 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info)
        if (!params.aid || params.aid > IEEE80211_MAX_AID)
                return -EINVAL;
 
+       if (info->attrs[NL80211_ATTR_STA_CAPABILITY]) {
+               params.capability =
+                       nla_get_u16(info->attrs[NL80211_ATTR_STA_CAPABILITY]);
+               params.sta_modify_mask |= STATION_PARAM_APPLY_CAPABILITY;
+       }
+
+       if (info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY]) {
+               params.ext_capab =
+                       nla_data(info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY]);
+               params.ext_capab_len =
+                       nla_len(info->attrs[NL80211_ATTR_STA_EXT_CAPABILITY]);
+       }
+
        if (info->attrs[NL80211_ATTR_HT_CAPABILITY])
                params.ht_capa =
                        nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]);