Staging: rt3090: port changes in WPA_MIX_PAIR_CIPHER to rt3090
authorAxel K <rain_maker@root-forum.org>
Thu, 3 Sep 2009 20:04:59 +0000 (22:04 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:34 +0000 (12:02 -0700)
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>
drivers/staging/rt3090/common/cmm_wpa.c

index 35f4701c024293a5614f5bfafeb174b76504b2c2..bf68ad8747ac7bb7a0039b74a3bcd167900baa22 100644 (file)
@@ -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;