From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Wed, 13 Jul 2011 05:13:20 +0000 (-0500)
Subject: staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N
X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~132^2~36
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e755463c216b76f07692a83c6cd7197fa31e5d89;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 3cbfdeb6290e..1d3504463543 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/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;