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 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)
189 prev_bssid, 189 prev_bssid,
190 params->ssid, params->ssid_len, 190 params->ssid, params->ssid_len,
191 params->ie, params->ie_len, 191 params->ie, params->ie_len,
192 false, &params->crypto); 192 false, &params->crypto,
193 params->flags, &params->ht_capa,
194 &params->ht_capa_mask);
193 if (err) 195 if (err)
194 __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid, 196 __cfg80211_mlme_deauth(rdev, wdev->netdev, params->bssid,
195 NULL, 0, 197 NULL, 0,
@@ -773,6 +775,9 @@ int __cfg80211_connect(struct cfg80211_registered_device *rdev,
773 wdev->connect_keys = NULL; 775 wdev->connect_keys = NULL;
774 } 776 }
775 777
778 cfg80211_oper_and_ht_capa(&connect->ht_capa_mask,
779 rdev->wiphy.ht_capa_mod_mask);
780
776 if (connkeys && connkeys->def >= 0) { 781 if (connkeys && connkeys->def >= 0) {
777 int idx; 782 int idx;
778 u32 cipher; 783 u32 cipher;