summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAxel K <rain_maker@root-forum.org>2009-09-03 22:04:59 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:34 -0700
commit230da57e68636e35c07b144fd25f4bd7f67c1e1c (patch)
treeb53e84f00b19ceabf834b50b6be855dd9faf7f32 /drivers
parent0961284c7208dfd907456fa73823f5967331b957 (diff)
Staging: rt3090: port changes in WPA_MIX_PAIR_CIPHER to rt3090
This patch ports a change recently applied to rt2860/rt2870 in order to change handling of WPA1/WPA2 mixed mode to rt3090. Signed-off-by: Axel Koellhofer <rain_maker@root-forum.org> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rt3090/common/cmm_wpa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rt3090/common/cmm_wpa.c b/drivers/staging/rt3090/common/cmm_wpa.c
index 35f4701c0242..bf68ad8747ac 100644
--- a/drivers/staging/rt3090/common/cmm_wpa.c
+++ b/drivers/staging/rt3090/common/cmm_wpa.c
@@ -1904,7 +1904,7 @@ VOID RTMPMakeRSNIE(
UCHAR PrimaryRsnie;
BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different
UCHAR p_offset;
- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
+ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
rsnielen_cur_p = NULL;
rsnielen_ex_cur_p = NULL;