wireless: Support ht-capabilities over-rides.

This allows users to disable features such as HT, HT40,
and to modify the MCS, AMPDU, and AMSDU settings for
drivers that support it.

The MCS, AMPDU, and AMSDU features that may be disabled are
are reported in the phy-info netlink message as a mask.

Attemping to disable features that are not supported will
take no affect, but will not return errors.  This is to aid
backwards compatibility in user-space apps that may not be
clever enough to deal with parsing the the capabilities mask.

This patch only enables the infrastructure.  An additional
patch will enable the feature in mac80211.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 91 insertions, 7 deletions

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 1c7d4df5418c..fb08c28fc90a 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -341,13 +341,17 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
                           const u8 *bssid, const u8 *prev_bssid,
                           const u8 *ssid, int ssid_len,
                           const u8 *ie, int ie_len, bool use_mfp,
-                          struct cfg80211_crypto_settings *crypt);
+                          struct cfg80211_crypto_settings *crypt,
+                          u32 assoc_flags, struct ieee80211_ht_cap *ht_capa,
+                          struct ieee80211_ht_cap *ht_capa_mask);
 int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
                         struct net_device *dev, struct ieee80211_channel *chan,
                         const u8 *bssid, const u8 *prev_bssid,
                         const u8 *ssid, int ssid_len,
                         const u8 *ie, int ie_len, bool use_mfp,
-                        struct cfg80211_crypto_settings *crypt);
+                        struct cfg80211_crypto_settings *crypt,
+                        u32 assoc_flags, struct ieee80211_ht_cap *ht_capa,
+                        struct ieee80211_ht_cap *ht_capa_mask);
 int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev,
                            struct net_device *dev, const u8 *bssid,
                            const u8 *ie, int ie_len, u16 reason,
@@ -379,6 +383,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
                           bool channel_type_valid, unsigned int wait,
                           const u8 *buf, size_t len, bool no_cck,
                           bool dont_wait_for_ack, u64 *cookie);
+void cfg80211_oper_and_ht_capa(struct ieee80211_ht_cap *ht_capa,
+                               const struct ieee80211_ht_cap *ht_capa_mask);
 
 /* SME */
 int __cfg80211_connect(struct cfg80211_registered_device *rdev,
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 6c1bafd508c8..438dfc105b4a 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -501,13 +501,32 @@ int cfg80211_mlme_auth(struct cfg80211_registered_device *rdev,
         return err;
 }
 
+/*  Do a logical ht_capa &= ht_capa_mask.  */
+void cfg80211_oper_and_ht_capa(struct ieee80211_ht_cap *ht_capa,
+                               const struct ieee80211_ht_cap *ht_capa_mask)
+{
+        int i;
+        u8 *p1, *p2;
+        if (!ht_capa_mask) {
+                memset(ht_capa, 0, sizeof(*ht_capa));
+                return;
+        }
+
+        p1 = (u8*)(ht_capa);
+        p2 = (u8*)(ht_capa_mask);
+        for (i = 0; i<sizeof(*ht_capa); i++)
+                p1[i] &= p2[i];
+}
+
 int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
                           struct net_device *dev,
                           struct ieee80211_channel *chan,
                           const u8 *bssid, const u8 *prev_bssid,
                           const u8 *ssid, int ssid_len,
                           const u8 *ie, int ie_len, bool use_mfp,
-                          struct cfg80211_crypto_settings *crypt)
+                          struct cfg80211_crypto_settings *crypt,
+                          u32 assoc_flags, struct ieee80211_ht_cap *ht_capa,
+                          struct ieee80211_ht_cap *ht_capa_mask)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         struct cfg80211_assoc_request req;
@@ -537,6 +556,15 @@ int __cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
         memcpy(&req.crypto, crypt, sizeof(req.crypto));
         req.use_mfp = use_mfp;
         req.prev_bssid = prev_bssid;
+        req.flags = assoc_flags;
+        if (ht_capa)
+                memcpy(&req.ht_capa, ht_capa, sizeof(req.ht_capa));
+        if (ht_capa_mask)
+                memcpy(&req.ht_capa_mask, ht_capa_mask,
+                       sizeof(req.ht_capa_mask));
+        cfg80211_oper_and_ht_capa(&req.ht_capa_mask,
+                                  rdev->wiphy.ht_capa_mod_mask);
+
         req.bss = cfg80211_get_bss(&rdev->wiphy, chan, bssid, ssid, ssid_len,
                                    WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
         if (!req.bss) {
@@ -574,14 +602,17 @@ int cfg80211_mlme_assoc(struct cfg80211_registered_device *rdev,
                         const u8 *bssid, const u8 *prev_bssid,
                         const u8 *ssid, int ssid_len,
                         const u8 *ie, int ie_len, bool use_mfp,
-                        struct cfg80211_crypto_settings *crypt)
+                        struct cfg80211_crypto_settings *crypt,
+                        u32 assoc_flags, struct ieee80211_ht_cap *ht_capa,
+                        struct ieee80211_ht_cap *ht_capa_mask)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         int err;
 
         wdev_lock(wdev);
         err = __cfg80211_mlme_assoc(rdev, dev, chan, bssid, prev_bssid,
-                                    ssid, ssid_len, ie, ie_len, use_mfp, crypt);
+                                    ssid, ssid_len, ie, ie_len, use_mfp, crypt,
+                                    assoc_flags, ht_capa, ht_capa_mask);
         wdev_unlock(wdev);
 
         return err;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 889f06483862..a1cabde7cb5f 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -200,6 +200,10 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_PROBE_RESP] = { .type = NLA_BINARY,
                                       .len = IEEE80211_MAX_DATA_LEN },
         [NL80211_ATTR_DFS_REGION] = { .type = NLA_U8 },
+        [NL80211_ATTR_DISABLE_HT] = { .type = NLA_FLAG },
+        [NL80211_ATTR_HT_CAPABILITY_MASK] = {
+                .len = NL80211_HT_CAPABILITY_LEN
+        },
 };
 
 /* policy for the key attributes */
@@ -1032,6 +1036,11 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
 
         NLA_PUT_U32(msg, NL80211_ATTR_FEATURE_FLAGS, dev->wiphy.features);
 
+        if (dev->wiphy.ht_capa_mod_mask)
+                NLA_PUT(msg, NL80211_ATTR_HT_CAPABILITY_MASK,
+                        sizeof(*dev->wiphy.ht_capa_mod_mask),
+                        dev->wiphy.ht_capa_mod_mask);
+
         return genlmsg_end(msg, hdr);
 
  nla_put_failure:
@@ -4413,6 +4422,9 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
         const u8 *bssid, *ssid, *ie = NULL, *prev_bssid = NULL;
         int err, ssid_len, ie_len = 0;
         bool use_mfp = false;
+        u32 flags = 0;
+        struct ieee80211_ht_cap *ht_capa = NULL;
+        struct ieee80211_ht_cap *ht_capa_mask = NULL;
 
         if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))
                 return -EINVAL;
@@ -4456,11 +4468,25 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
         if (info->attrs[NL80211_ATTR_PREV_BSSID])
                 prev_bssid = nla_data(info->attrs[NL80211_ATTR_PREV_BSSID]);
 
+        if (nla_get_flag(info->attrs[NL80211_ATTR_DISABLE_HT]))
+                flags |= ASSOC_REQ_DISABLE_HT;
+
+        if (info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK])
+                ht_capa_mask =
+                        nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK]);
+
+        if (info->attrs[NL80211_ATTR_HT_CAPABILITY]) {
+                if (!ht_capa_mask)
+                        return -EINVAL;
+                ht_capa = nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]);
+        }
+
         err = nl80211_crypto_settings(rdev, info, &crypto, 1);
         if (!err)
                 err = cfg80211_mlme_assoc(rdev, dev, chan, bssid, prev_bssid,
                                           ssid, ssid_len, ie, ie_len, use_mfp,
-                                          &crypto);
+                                          &crypto, flags, ht_capa,
+                                          ht_capa_mask);
 
         return err;
 }
@@ -4950,6 +4976,22 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info)
                         return PTR_ERR(connkeys);
         }
 
+        if (nla_get_flag(info->attrs[NL80211_ATTR_DISABLE_HT]))
+                connect.flags |= ASSOC_REQ_DISABLE_HT;
+
+        if (info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK])
+                memcpy(&connect.ht_capa_mask,
+                       nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK]),
+                       sizeof(connect.ht_capa_mask));
+
+        if (info->attrs[NL80211_ATTR_HT_CAPABILITY]) {
+                if (!info->attrs[NL80211_ATTR_HT_CAPABILITY_MASK])
+                        return -EINVAL;
+                memcpy(&connect.ht_capa,
+                       nla_data(info->attrs[NL80211_ATTR_HT_CAPABILITY]),
+                       sizeof(connect.ht_capa));
+        }
+
         err = cfg80211_connect(rdev, dev, &connect, connkeys);
         if (err)
                 kfree(connkeys);
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 6e86d5acf145..ed9d0e6f4a06 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -189,7 +189,9 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
                                             prev_bssid,
                                             params->ssid, params->ssid_len,
                                             params->ie, params->ie_len,
-                                            false, &params->crypto);
+                                            false, &params->crypto,
+                                            params->flags, &params->ht_capa,
+                                            &params->ht_capa_mask);
                 if (err)
                         __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
                                                NULL, 0,
@@ -773,6 +775,9 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
                 wdev->connect_keys = NULL;
         }
 
+        cfg80211_oper_and_ht_capa(&connect->ht_capa_mask,
+                                  rdev->wiphy.ht_capa_mod_mask);
+
         if (connkeys && connkeys->def >= 0) {
                 int idx;
                 u32 cipher;