diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-11 22:25:07 -0500 |
---|---|---|
committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-23 20:11:59 -0500 |
commit | 1e71e6d0cf764841cdf60dec4a40849ff41be75c (patch) | |
tree | 57edd2c80373b38d4c46248190cec2eb2eb1eacd /drivers/staging/rtl8192e/rtl819x_HTProc.c | |
parent | 175159c537312f95150508655256645c8daa86a0 (diff) |
staging: rtl8192e: Remove dead code associated with RTL8192SE
The vendor code will generate several different drivers. As the RTL8192SE
is covered by a mac80211 driver in mainline, eliminate that code heere.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl819x_HTProc.c')
-rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 184 |
1 files changed, 0 insertions, 184 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index a212a972ec6..62dd0976e44 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -436,14 +436,6 @@ bool HTIOTActIsDisableMCSTwoSpatialStream(struct rtllib_device* ieee) (pHTInfo->IOTPeer != HT_IOT_PEER_RALINK) ) retValue = true; } -#elif defined(RTL8192SE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if (ieee->rtllib_ap_sec_type && - (ieee->rtllib_ap_sec_type(ieee)&SEC_ALG_TKIP)) { - if (pHTInfo->IOTPeer == HT_IOT_PEER_RALINK){ - retValue = true; - } - } #endif return retValue; } @@ -519,11 +511,7 @@ HTIOTActWAIOTBroadcom(struct rtllib_device* ieee) u8 HTIOTActIsForcedCTS2Self(struct rtllib_device *ieee, struct rtllib_network *network) { u8 retValue = 0; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - if ((ieee->pHTInfo->IOTPeer == HT_IOT_PEER_MARVELL) ||(ieee->pHTInfo->IOTPeer == HT_IOT_PEER_ATHEROS) ) -#else if (ieee->pHTInfo->IOTPeer == HT_IOT_PEER_MARVELL) -#endif { retValue = 1; } @@ -534,17 +522,6 @@ u8 HTIOTActIsForcedCTS2Self(struct rtllib_device *ieee, struct rtllib_network *n u8 HTIOTActIsForcedRTSCTS(struct rtllib_device *ieee, struct rtllib_network *network) { u8 retValue = 0; -#if defined(RTL8192SE) || defined(RTL8192SU) - if (ieee->pHTInfo->bCurrentHTSupport) - { - if ((ieee->pHTInfo->IOTPeer != HT_IOT_PEER_REALTEK)&& - (ieee->pHTInfo->IOTPeer != HT_IOT_PEER_REALTEK_92SE)) - { - if ((ieee->pHTInfo->IOTAction & HT_IOT_ACT_TX_NO_AGGREGATION) == 0) - retValue = 1; - } - } -#endif return retValue; } @@ -570,12 +547,6 @@ u8 HTIOCActRejcectADDBARequest(struct rtllib_network *network) { u8 retValue = 0; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - { - - - } -#endif return retValue; @@ -602,16 +573,6 @@ u8 return 1; } -#elif defined RTL8192SE - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (ieee->rtllib_ap_sec_type != NULL) - if (ieee->rtllib_ap_sec_type(ieee) == SEC_ALG_CCMP) - if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK){ - return 1; - } - - } #endif return retValue; } @@ -634,9 +595,6 @@ u8 HTIOTActDisableHighPower(struct rtllib_device* ieee,struct rtllib_network *network) { u8 retValue = 0; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; -#endif #ifdef RTL8192SU if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK || @@ -645,12 +603,6 @@ HTIOTActDisableHighPower(struct rtllib_device* ieee,struct rtllib_network *netwo { retValue = 1; } -#elif defined RTL8192SE || defined RTL8192CE - if (pHTInfo->IOTPeer==HT_IOT_PEER_RALINK || - pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK ) - { - retValue = 1; - } #endif return retValue; } @@ -675,19 +627,6 @@ HTIOTActIsDisableTx40MHz(struct rtllib_device* ieee,struct rtllib_network *netwo { u8 retValue = 0; -#if (defined RTL8192SU || defined RTL8192SE || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if ( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP40 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP104 == ieee->group_key_type) || - (KEY_TYPE_WEP40 == ieee->group_key_type) || - (KEY_TYPE_TKIP == ieee->pairwise_key_type) ) - { - if ((pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK) && (network->bssht.bdSupportHT)) - retValue = 1; - } -#endif - return retValue; } @@ -696,19 +635,6 @@ HTIOTActIsTxNoAggregation(struct rtllib_device* ieee,struct rtllib_network *netw { u8 retValue = 0; -#if (defined RTL8192SU || defined RTL8192SE || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if ( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP40 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP104 == ieee->group_key_type) || - (KEY_TYPE_WEP40 == ieee->group_key_type) || - (KEY_TYPE_TKIP == ieee->pairwise_key_type) ) - { - if (pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK) - retValue = 1; - } -#endif - return retValue; } @@ -718,19 +644,6 @@ HTIOTActIsDisableTx2SS(struct rtllib_device* ieee,struct rtllib_network *network { u8 retValue = 0; -#if (defined RTL8192SU || defined RTL8192SE || defined RTL8192CE) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - if ( (KEY_TYPE_WEP104 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP40 == ieee->pairwise_key_type) || - (KEY_TYPE_WEP104 == ieee->group_key_type) || - (KEY_TYPE_WEP40 == ieee->group_key_type) || - (KEY_TYPE_TKIP == ieee->pairwise_key_type) ) - { - if ((pHTInfo->IOTPeer==HT_IOT_PEER_REALTEK) && (network->bssht.bdSupportHT)) - retValue = 1; - } -#endif - return retValue; } @@ -753,15 +666,6 @@ bool HTIOCActIsDisableCckRate(struct rtllib_device* ieee,struct rtllib_network * bool HTIOCActAllowPeerAggOnePacket(struct rtllib_device* ieee,struct rtllib_network *network) { bool retValue = false; -#if defined(RTL8192SE) || defined(RTL8192SU) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (ieee->VersionID<2) - if (pHTInfo->IOTPeer == HT_IOT_PEER_MARVELL) - return true; - - } -#endif return retValue; } @@ -769,14 +673,6 @@ bool HTIOTActIsNullDataPowerSaving(struct rtllib_device* ieee,struct rtllib_network *network) { bool retValue = false; -#if defined(RTL8192SE) || defined(RTL8192SU) - PRT_HIGH_THROUGHPUT pHTInfo = ieee->pHTInfo; - { - if (pHTInfo->IOTPeer == HT_IOT_PEER_BROADCOM) - return true; - - } -#endif return retValue; } @@ -826,9 +722,6 @@ void HTConstructCapabilityElement(struct rtllib_device* ieee, u8* posHTCap, u8* pCapELE->ShortGI40Mhz = 1; pCapELE->TxSTBC = 1; -#if defined RTL8192SE || defined RTL8192CE - pCapELE->TxSTBC = 0; -#endif pCapELE->RxSTBC = 0; pCapELE->DelayBA = 0; pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE>=7935)?1:0; @@ -1131,18 +1024,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->CurrentMPDUDensity = pHTInfo->MPDU_Density; else pHTInfo->CurrentMPDUDensity = pPeerHTCap->MPDUDensity; -#if (defined RTL8192SE || defined RTL8192SU || defined RTL8192CE) - if (ieee->SetHwRegHandler != NULL) { - ieee->SetHwRegHandler( ieee->dev, HW_VAR_SHORTGI_DENSITY, (u8*)(&ieee->MaxMssDensity)); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_FACTOR, &pHTInfo->CurrentAMPDUFactor); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_MIN_SPACE, &pHTInfo->CurrentMPDUDensity); - } -#elif defined RTL8192CE - if (ieee->SetHwRegHandler != NULL) { - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_FACTOR, &pHTInfo->CurrentAMPDUFactor); - ieee->SetHwRegHandler(ieee->dev, HW_VAR_AMPDU_MIN_SPACE, &pHTInfo->CurrentMPDUDensity); - } -#endif if (pHTInfo->IOTAction & HT_IOT_ACT_TX_USE_AMSDU_8K) { pHTInfo->bCurrentAMPDUEnable = false; @@ -1290,71 +1171,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device* ieee, struct rtllib_net bIOTAction = HTIOTActIsCCDFsync(ieee); if (bIOTAction) pHTInfo->IOTAction |= HT_IOT_ACT_CDD_FSYNC; -#if defined(RTL8192SU) || defined(RTL8192SE) || defined RTL8192CE - bIOTAction = HTIOTActIsForcedCTS2Self(ieee,pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_CTS2SELF; - - - bIOTAction = HTIOTActIsEnableBETxOPLimit(ieee); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_ENABLE_BE_TXOP; - -#if defined(RTL8192SU) - bIOTAction = HTIOCActRejcectADDBARequest(pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_REJECT_ADDBA_REQ; -#endif - - bIOTAction = HTIOCActAllowPeerAggOnePacket(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT; - - bIOTAction = HTIOTActIsEDCABiasRx(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_EDCA_BIAS_ON_RX; - -#if defined(RTL8192SU) - bIOTAction = HTIOCActIsDisableCckRate(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_CCK_RATE; -#endif - bIOTAction = HTIOTActDisableShortGI(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_SHORT_GI; - - bIOTAction = HTIOTActDisableHighPower(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_HIGH_POWER; - - - bIOTAction = HTIOTActIsForcedAMSDU8K(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_TX_USE_AMSDU_8K; - -#if defined(RTL8192SU) - bIOTAction = HTIOTActIsTxNoAggregation(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_TX_NO_AGGREGATION; - - bIOTAction = HTIOTActIsDisableTx40MHz(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_TX_40_MHZ; - - bIOTAction = HTIOTActIsDisableTx2SS(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_DISABLE_TX_2SS; -#endif - - bIOTAction = HTIOTActIsForcedRTSCTS(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_FORCED_RTS; - - bIOTAction = HTIOTActIsNullDataPowerSaving(ieee, pNetwork); - if (bIOTAction) - pHTInfo->IOTAction |= HT_IOT_ACT_NULL_DATA_POWER_SAVING; -#endif - } else { pHTInfo->bCurrentHTSupport = false; pHTInfo->bCurrentRT2RTAggregation = false; |