From b355c1d0bceee3276b406327c6f1765c73901ab0 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 11 Jul 2011 22:37:27 -0500 Subject: staging: rtl8192e: Remove dead code associated with RTL8192CE The vendor code will generate several different drivers. As the RTL8192CE is covered by a mac80211 driver in mainline, eliminate that code here. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 33 ------------------------------- 1 file changed, 33 deletions(-) (limited to 'drivers/staging/rtl8192e/rtl819x_HTProc.c') diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 62dd097..0e7f078 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -64,10 +64,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee) { PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; -#ifdef RTL8192CE - pHTInfo->bRDGEnable = 0; -#endif - pHTInfo->bAcceptAddbaReq = 1; pHTInfo->bRegShortGI20MHz= 1; @@ -424,19 +420,6 @@ bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device* ieee) } } #endif -#if defined(RTL8192SU) || defined RTL8192CE - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if (ieee->rtllib_ap_sec_type && - (ieee->rtllib_ap_sec_type(ieee)&(SEC_ALG_WEP|SEC_ALG_TKIP))) - { - if ( (pHTInfo->IOTPeer != HT_IOT_PEER_ATHEROS) && - (pHTInfo->IOTPeer != HT_IOT_PEER_UNKNOWN) && - (pHTInfo->IOTPeer != HT_IOT_PEER_MARVELL) && - (pHTInfo->IOTPeer != HT_IOT_PEER_REALTEK_92SE) && - (pHTInfo->IOTPeer != HT_IOT_PEER_RALINK) ) - retValue = true; - } -#endif return retValue; } @@ -453,10 +436,6 @@ bool HTIOTActIsEnableBETxOPLimit(struct rtllib_device* ieee) #if defined RTL8192SU if (ieee->mode == IEEE_G) retValue = true; -#elif defined RTL8192CE - if (ieee->mode == IEEE_G || - (ieee->rtllib_ap_sec_type(ieee)&(SEC_ALG_WEP|SEC_ALG_TKIP))) - retValue = true; #endif return retValue; @@ -565,14 +544,6 @@ u8 return 1; } -#elif defined RTL8192CE - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (pHTInfo->IOTPeer==HT_IOT_PEER_ATHEROS || - pHTInfo->IOTPeer==HT_IOT_PEER_RALINK) - return 1; - - } #endif return retValue; } @@ -832,11 +803,7 @@ void HTConstructRT2RTAggElement(struct rtllib_device* ieee, u8* posRT2RTAgg, u8* *posRT2RTAgg++ = 0x02; *posRT2RTAgg++ = 0x01; -#ifdef RTL8192CE - *posRT2RTAgg = 0x70; -#else *posRT2RTAgg = 0x30; -#endif if (ieee->bSupportRemoteWakeUp) { *posRT2RTAgg |= RT_HT_CAP_USE_WOW; -- cgit v1.1