On Mon, 2009-07-20 at 11:47 +0800, Zhu Yi wrote:
> We invoke the cfg80211 set_default_key callback only for WEP key
> configuring.
>
> Signed-off-by: Zhu Yi <yi.zhu@xxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
> net/wireless/wext-compat.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
> index aa80c0c..c63e10e 100644
> --- a/net/wireless/wext-compat.c
> +++ b/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,
Attachment:
signature.asc
Description: This is a digitally signed message part
