dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

cfg80211: set_default_key only for WEP 

We invoke the cfg80211 set_default_key callback only for WEP key
configuring.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Zhu Yi 2009-07-20 11:47:43 +08:00 committed by John W. Linville
parent e6a3f551bc
commit 1f00fca5c8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/wireless/wext-compat.c
View File

@ -531,7 +531,8 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
wdev->wext.keys->data[idx];
}
if (params->cipher != WLAN_CIPHER_SUITE_AES_CMAC &&
if ((params->cipher == WLAN_CIPHER_SUITE_WEP40 ||
params->cipher == WLAN_CIPHER_SUITE_WEP104) &&
(tx_key || (!addr && wdev->wext.default_key == -1))) {
if (wdev->current_bss)
err = rdev->ops->set_default_key(&rdev->wiphy,