diff --git a/[refs] b/[refs]
index 07df158bb4c1..67258d9ad338 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0961284c7208dfd907456fa73823f5967331b957
+refs/heads/master: 230da57e68636e35c07b144fd25f4bd7f67c1e1c
diff --git a/trunk/drivers/staging/rt3090/common/cmm_wpa.c b/trunk/drivers/staging/rt3090/common/cmm_wpa.c
index 35f4701c0242..bf68ad8747ac 100644
--- a/trunk/drivers/staging/rt3090/common/cmm_wpa.c
+++ b/trunk/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;