From b8275919f3f6393718b207c6931d1c102c77e61a Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Wed, 13 Jul 2011 00:13:20 -0500
Subject: [PATCH] --- yaml --- r: 267668 b: refs/heads/master c:
 e755463c216b76f07692a83c6cd7197fa31e5d89 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/rtl8192e/rtllib_softmac.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3a1d7ce7018b..8d93be9abb2e 100644
--- 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
index 3cbfdeb6290e..1d3504463543 100644
--- 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;