diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-08-23 15:29:32 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:21 -0700 |
commit | 3cf830a1dbd3ad5da682b9f6f338428f97500432 (patch) | |
tree | 99f7269511da149dcbbd23888459a6ccc85100b6 /drivers/staging/rt2860/common/mlme.c | |
parent | a149b51d2d2a2913e30e8697e4cc65a20719c695 (diff) |
Staging: rt3070: WEP fixes
Propagate WEP fixes from rt28[67]0 to rt3070.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/common/mlme.c')
-rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 3364d672d8dc..16192117776b 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c @@ -3912,11 +3912,8 @@ VOID BssTableSsidSort( continue; // check group cipher - if ( -#ifndef RT30xx - pInBss->WPA.GroupCipher != Ndis802_11GroupWEP40Enabled && + if (pInBss->WPA.GroupCipher != Ndis802_11GroupWEP40Enabled && pInBss->WPA.GroupCipher != Ndis802_11GroupWEP104Enabled && -#endif pAd->StaCfg.WepStatus < pInBss->WPA.GroupCipher) continue; @@ -3936,11 +3933,8 @@ VOID BssTableSsidSort( continue; // check group cipher - if ( -#ifndef RT30xx - pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP40Enabled && + if (pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP40Enabled && pInBss->WPA2.GroupCipher != Ndis802_11GroupWEP104Enabled && -#endif pAd->StaCfg.WepStatus < pInBss->WPA2.GroupCipher) continue; @@ -4219,16 +4213,10 @@ VOID BssCipherParse( switch (*pTmp) { case 1: -#ifndef RT30xx pBss->WPA.GroupCipher = Ndis802_11GroupWEP40Enabled; break; case 5: pBss->WPA.GroupCipher = Ndis802_11GroupWEP104Enabled; -#endif -#ifdef RT30xx - case 5: // Although WEP is not allowed in WPA related auth mode, we parse it anyway - pBss->WPA.GroupCipher = Ndis802_11Encryption1Enabled; -#endif break; case 2: pBss->WPA.GroupCipher = Ndis802_11Encryption2Enabled; @@ -4344,16 +4332,10 @@ VOID BssCipherParse( switch (pCipher->Type) { case 1: -#ifndef RT30xx pBss->WPA2.GroupCipher = Ndis802_11GroupWEP40Enabled; break; case 5: pBss->WPA2.GroupCipher = Ndis802_11GroupWEP104Enabled; -#endif -#ifdef RT30xx - case 5: // Although WEP is not allowed in WPA related auth mode, we parse it anyway - pBss->WPA2.GroupCipher = Ndis802_11Encryption1Enabled; -#endif break; case 2: pBss->WPA2.GroupCipher = Ndis802_11Encryption2Enabled; |