diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-07-22 13:59:15 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-26 21:32:41 +0200 |
| commit | 3be61a3851c458fb4ce394645e26e8e9670c796a (patch) | |
| tree | 3cd39f153d416a4c2080acb6394e76ab72d43320 /net/wireless | |
| parent | mac80211: remove bogus rcu_read_lock() (diff) | |
| download | linux-3be61a3851c458fb4ce394645e26e8e9670c796a.tar.xz linux-3be61a3851c458fb4ce394645e26e8e9670c796a.zip | |
cfg80211: fix IBSS default management key
When wireless extensions are used to control
an encrypted IBSS, we erroneously can try to
set the default management key. Fix this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/ibss.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index adcabba02e20..27a8ce9343c3 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -247,8 +247,10 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, if (!netif_running(wdev->netdev)) return 0; - if (wdev->wext.keys) + if (wdev->wext.keys) { wdev->wext.keys->def = wdev->wext.default_key; + wdev->wext.keys->defmgmt = wdev->wext.default_mgmt_key; + } wdev->wext.ibss.privacy = wdev->wext.default_key != -1; |