---

yaml --- r: 267668 b: refs/heads/master c: e755463 h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · b827591 · b827591
1 parent 8f0481f
commit b827591
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e3b1830591d7d5460e2346cdb535d209de2cab9
+refs/heads/master: e755463c216b76f07692a83c6cd7197fa31e5d89
diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1273,11 +1273,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,stru
 		encrypt = 0;
 	}
 
-#ifdef ENABLE_TKIP11N
-	if (ieee->bForcedBgMode == true)
-#else
 	if ((ieee->rtllib_ap_sec_type && (ieee->rtllib_ap_sec_type(ieee)&SEC_ALG_TKIP)) ||(ieee->bForcedBgMode == true))
-#endif
 	{
 		ieee->pHTInfo->bEnableHT = 0;
 		ieee->mode = WIRELESS_MODE_G;