Commit 94f85853 authored Sep 17, 2009 by Johannes Berg Committed by John W. Linville Sep 23, 2009

cfg80211: don't overwrite privacy setting



When cfg80211 is instructed to connect, it always
uses the default WEP key for the privacy setting,
which clearly is wrong when using wpa_supplicant.
Don't overwrite the setting, and rely on it being
false when wpa_supplicant is not running, instead
set it to true when we have keys.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 018ae372

net/wireless/wext-sme.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,11 +26,11 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,

		wdev->wext.connect.ie = wdev->wext.ie;
		wdev->wext.connect.ie_len = wdev->wext.ie_len;
		wdev->wext.connect.privacy = wdev->wext.default_key != -1;

		if (wdev->wext.keys) {
		wdev->wext.keys->def = wdev->wext.default_key;
		wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key;
		wdev->wext.connect.privacy = true;
		}

		if (!wdev->wext.connect.ssid_len)