Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4be3bd8ccc195297870b9ffca4ef18bcbc2f1822

Authored by Johannes Berg
Committed by John W. Linville
1 parent 33de4f9d78
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

cfg80211: don't set privacy w/o key 

When wpa_supplicant is used to connect to open networks,
it causes the wdev->wext.keys to point to key memory, but
that key memory is all empty. Only use privacy when there
is a default key to be used.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Tested-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Tested-by: Kalle Valo <kalle.valo@iki.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

net/wireless/wext-sme.c
Diff comments   View file @ 4be3bd8
... ... @@ -30,7 +30,8 @@
30 30 if (wdev->wext.keys) {
31 31 wdev->wext.keys->def = wdev->wext.default_key;
32 32 wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key;
33   - wdev->wext.connect.privacy = true;
  33 + if (wdev->wext.default_key != -1)
  34 + wdev->wext.connect.privacy = true;
34 35 }
35 36  
36 37 if (!wdev->wext.connect.ssid_len)