From: Axel K Date: Thu, 3 Sep 2009 20:04:59 +0000 (+0200) Subject: Staging: rt3090: port changes in WPA_MIX_PAIR_CIPHER to rt3090 X-Git-Tag: v2.6.32-rc1~668^2~13 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=230da57e68636e35c07b144fd25f4bd7f67c1e1c;p=~shefty%2Frdma-dev.git 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 Acked-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rt3090/common/cmm_wpa.c b/drivers/staging/rt3090/common/cmm_wpa.c index 35f4701c024..bf68ad8747a 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;