diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-09-17 17:15:31 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-09-23 11:35:53 -0400 |
| commit | 94f85853324e02c3a32bc3101f090dc9a3f512b4 (patch) | |
| tree | b01c799520a5cb39e1403824de70f7935a5cce28 /net/wireless/wext-sme.c | |
| parent | 018ae37292dd391494172495142b87e816a841c0 (diff) | |
| download | linux-stable-94f85853324e02c3a32bc3101f090dc9a3f512b4.tar.gz linux-stable-94f85853324e02c3a32bc3101f090dc9a3f512b4.tar.bz2 linux-stable-94f85853324e02c3a32bc3101f090dc9a3f512b4.zip | |
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>
Diffstat (limited to 'net/wireless/wext-sme.c')
| -rw-r--r-- | net/wireless/wext-sme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c index d16cd9ea4d00..bf725275eb8d 100644 --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -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) |