projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0e3b183)
staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N
authorLarry Finger <Larry.Finger@lwfinger.net>
Wed, 13 Jul 2011 05:13:20 +0000 (00:13 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Wed, 24 Aug 2011 01:25:38 +0000 (20:25 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
drivers/staging/rtl8192e/rtllib_softmac.c patch | blob | blame | history

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 3cbfdeb6290ebb2fe930e23aacd97e5ea9a131d6..1d35044635432c63230aa463848e24a5afc167af 100644 (file)
--- 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;