Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[karo-tx-linux.git] / net / wireless / sme.c

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 0acfdc9beacf8a397b8122c236cd6156d6c78b7e..f0c900ce2fb9ee2dd0606fa651c15b078eb497e0 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -190,7 +190,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,
@@ -774,6 +776,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;