commit 1f00fca5c83c1bc5b4ca7e07f2a030bc39c130f2
author Zhu Yi <yi.zhu@intel.com> Mon Jul 20 11:47:43 2009 +0800
committer John W. Linville <linville@tuxdriver.com> Fri Jul 24 15:05:27 2009 -0400
tree 4614b44a228c5a32a1ae4f455e94d5101e0ef9fc
parent e6a3f551bc236010c4d4d99e626e150e98a4c3e6

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>

net/wireless/wext-compat.c

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index e6731bf..c7351a9 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -531,7 +531,8 @@
 			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,