From be622244c04d5f0805ea48ed7d5992e0e195ee45 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Mon, 20 Jul 2009 11:47:43 +0800 Subject: [PATCH] --- yaml --- r: 159175 b: refs/heads/master c: 1f00fca5c83c1bc5b4ca7e07f2a030bc39c130f2 h: refs/heads/master i: 159173: bc2c2bbcac5d91b46f0fbd1e32ad25f0638fa5ea 159171: b94f8078fdcca66740fe7e22ed267fddfda16780 159167: fef3d9609c89108f92384a93f93989ac19d07b05 v: v3 --- [refs] | 2 +- trunk/net/wireless/wext-compat.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ee98b0870586..b156e65149bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6a3f551bc236010c4d4d99e626e150e98a4c3e6 +refs/heads/master: 1f00fca5c83c1bc5b4ca7e07f2a030bc39c130f2 diff --git a/trunk/net/wireless/wext-compat.c b/trunk/net/wireless/wext-compat.c index e6731bf55062..c7351a98e660 100644 --- a/trunk/net/wireless/wext-compat.c +++ b/trunk/net/wireless/wext-compat.c @@ -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,