aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/sme.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r--net/wireless/sme.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 0acfdc9beac..f0c900ce2fb 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -190,7 +190,9 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev)
190 prev_bssid, 190 prev_bssid,
191 params->ssid, params->ssid_len, 191 params->ssid, params->ssid_len,
192 params->ie, params->ie_len, 192 params->ie, params->ie_len,
193 false, &params->crypto); 193 false, &params->crypto,
194 params->flags, &params->ht_capa,
195 &params->ht_capa_mask);
194 if (err) 196 if (err)
195 __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid, 197 __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
196 NULL, 0, 198 NULL, 0,
@@ -774,6 +776,9 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
774 wdev->connect_keys = NULL; 776 wdev->connect_keys = NULL;
775 } 777 }
776 778
779 cfg80211_oper_and_ht_capa(&connect->ht_capa_mask,
780 rdev->wiphy.ht_capa_mod_mask);
781
777 if (connkeys && connkeys->def >= 0) { 782 if (connkeys && connkeys->def >= 0) {
778 int idx; 783 int idx;
779 u32 cipher; 784 u32 cipher;