1 files changed, 34 insertions, 3 deletions

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;