staging: rtl8192e: Remove dead code involved with TO_DO_LIST
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
34a7eb3db2
commit
15e7650e88
|
@ -613,42 +613,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
|
||||||
priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13;
|
priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
switch (priv->CustomerID)
|
|
||||||
{
|
|
||||||
case RT_CID_DEFAULT:
|
|
||||||
priv->LedStrategy = SW_LED_MODE1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case RT_CID_819x_CAMEO:
|
|
||||||
priv->LedStrategy = SW_LED_MODE2;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case RT_CID_819x_RUNTOP:
|
|
||||||
priv->LedStrategy = SW_LED_MODE3;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case RT_CID_819x_Netcore:
|
|
||||||
priv->LedStrategy = SW_LED_MODE4;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case RT_CID_Nettronix:
|
|
||||||
priv->LedStrategy = SW_LED_MODE5;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case RT_CID_PRONET:
|
|
||||||
priv->LedStrategy = SW_LED_MODE6;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case RT_CID_TOSHIBA:
|
|
||||||
|
|
||||||
default:
|
|
||||||
priv->LedStrategy = SW_LED_MODE1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
RT_TRACE(COMP_INIT, "LedStrategy = %d \n", priv->LedStrategy);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
|
if ( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
|
||||||
priv->rtllib->bSupportRemoteWakeUp = true;
|
priv->rtllib->bSupportRemoteWakeUp = true;
|
||||||
else
|
else
|
||||||
|
@ -832,20 +796,6 @@ start:
|
||||||
write_nic_word(dev, MAC4, ((u16*)(dev->dev_addr + 4))[0]);
|
write_nic_word(dev, MAC4, ((u16*)(dev->dev_addr + 4))[0]);
|
||||||
write_nic_dword(dev, RCR, priv->ReceiveConfig);
|
write_nic_dword(dev, RCR, priv->ReceiveConfig);
|
||||||
|
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
if (priv->bInHctTest)
|
|
||||||
{
|
|
||||||
write_nic_dword(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK_DTM << RSVD_FW_QUEUE_PAGE_BK_SHIFT |\
|
|
||||||
NUM_OF_PAGE_IN_FW_QUEUE_BE_DTM << RSVD_FW_QUEUE_PAGE_BE_SHIFT | \
|
|
||||||
NUM_OF_PAGE_IN_FW_QUEUE_VI_DTM << RSVD_FW_QUEUE_PAGE_VI_SHIFT | \
|
|
||||||
NUM_OF_PAGE_IN_FW_QUEUE_VO_DTM <<RSVD_FW_QUEUE_PAGE_VO_SHIFT);
|
|
||||||
write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
|
|
||||||
write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW| \
|
|
||||||
NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT|\
|
|
||||||
NUM_OF_PAGE_IN_FW_QUEUE_PUB_DTM<<RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
write_nic_dword(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |\
|
write_nic_dword(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |\
|
||||||
NUM_OF_PAGE_IN_FW_QUEUE_BE << RSVD_FW_QUEUE_PAGE_BE_SHIFT | \
|
NUM_OF_PAGE_IN_FW_QUEUE_BE << RSVD_FW_QUEUE_PAGE_BE_SHIFT | \
|
||||||
|
|
|
@ -355,15 +355,6 @@ void rtl8192_phy_configmac(struct net_device* dev)
|
||||||
u32 dwArrayLen = 0, i = 0;
|
u32 dwArrayLen = 0, i = 0;
|
||||||
u32* pdwArray = NULL;
|
u32* pdwArray = NULL;
|
||||||
struct r8192_priv *priv = rtllib_priv(dev);
|
struct r8192_priv *priv = rtllib_priv(dev);
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
if (dev->bInHctTest)
|
|
||||||
{
|
|
||||||
RT_TRACE(COMP_PHY, "Rtl819XMACPHY_ArrayDTM\n");
|
|
||||||
dwArrayLen = MACPHY_ArrayLengthDTM;
|
|
||||||
pdwArray = Rtl819XMACPHY_ArrayDTM;
|
|
||||||
}
|
|
||||||
else if (priv->bTXPowerDataReadFromEEPORM)
|
|
||||||
#endif
|
|
||||||
if (priv->bTXPowerDataReadFromEEPORM)
|
if (priv->bTXPowerDataReadFromEEPORM)
|
||||||
{
|
{
|
||||||
RT_TRACE(COMP_PHY, "Rtl819XMACPHY_Array_PG\n");
|
RT_TRACE(COMP_PHY, "Rtl819XMACPHY_Array_PG\n");
|
||||||
|
@ -397,26 +388,6 @@ void rtl8192_phyConfigBB(struct net_device* dev, u8 ConfigType)
|
||||||
u32* Rtl819XAGCTAB_Array_Table = NULL;
|
u32* Rtl819XAGCTAB_Array_Table = NULL;
|
||||||
u16 AGCTAB_ArrayLen, PHY_REGArrayLen = 0;
|
u16 AGCTAB_ArrayLen, PHY_REGArrayLen = 0;
|
||||||
struct r8192_priv *priv = rtllib_priv(dev);
|
struct r8192_priv *priv = rtllib_priv(dev);
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
u32 *rtl8192PhyRegArrayTable = NULL, *rtl8192AgcTabArrayTable = NULL;
|
|
||||||
if (dev->bInHctTest)
|
|
||||||
{
|
|
||||||
AGCTAB_ArrayLen = AGCTAB_ArrayLengthDTM;
|
|
||||||
Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_ArrayDTM;
|
|
||||||
|
|
||||||
if (priv->RF_Type == RF_2T4R)
|
|
||||||
{
|
|
||||||
PHY_REGArrayLen = PHY_REGArrayLengthDTM;
|
|
||||||
Rtl819XPHY_REGArray_Table = Rtl819XPHY_REGArrayDTM;
|
|
||||||
}
|
|
||||||
else if (priv->RF_Type == RF_1T2R)
|
|
||||||
{
|
|
||||||
PHY_REGArrayLen = PHY_REG_1T2RArrayLengthDTM;
|
|
||||||
Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArrayDTM;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
AGCTAB_ArrayLen = AGCTAB_ArrayLength;
|
AGCTAB_ArrayLen = AGCTAB_ArrayLength;
|
||||||
Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array;
|
Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array;
|
||||||
|
@ -839,10 +810,6 @@ void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)
|
||||||
switch (priv->rf_chip)
|
switch (priv->rf_chip)
|
||||||
{
|
{
|
||||||
case RF_8225:
|
case RF_8225:
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
PHY_SetRF8225CckTxPower(dev, powerlevel);
|
|
||||||
PHY_SetRF8225OfdmTxPower(dev, powerlevelOFDM24G);
|
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RF_8256:
|
case RF_8256:
|
||||||
|
@ -1278,9 +1245,6 @@ void rtl8192_SetBWModeWorkItem(struct net_device *dev)
|
||||||
switch ( priv->rf_chip )
|
switch ( priv->rf_chip )
|
||||||
{
|
{
|
||||||
case RF_8225:
|
case RF_8225:
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
PHY_SetRF8225Bandwidth(dev, pHalData->CurrentChannelBW);
|
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RF_8256:
|
case RF_8256:
|
||||||
|
@ -1489,13 +1453,6 @@ SetRFPowerState8190(
|
||||||
QueueID++;
|
QueueID++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
else if (IsLowPowerState(Adapter))
|
|
||||||
{
|
|
||||||
RT_TRACE((COMP_POWER|COMP_RF), "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 but lower power state!\n", (i+1), QueueID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
RT_TRACE((COMP_POWER|COMP_RF), "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 before doze!\n", (i+1), QueueID);
|
RT_TRACE((COMP_POWER|COMP_RF), "eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 before doze!\n", (i+1), QueueID);
|
||||||
|
@ -1528,14 +1485,6 @@ SetRFPowerState8190(
|
||||||
QueueID++;
|
QueueID++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
else if (IsLowPowerState(Adapter))
|
|
||||||
{
|
|
||||||
RT_TRACE(COMP_POWER,
|
|
||||||
"eRf Off/Sleep: %d times TcbBusyQueue[%d] !=0 but lower power state!\n", (i+1), QueueID);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
RT_TRACE(COMP_POWER,
|
RT_TRACE(COMP_POWER,
|
||||||
|
@ -1562,16 +1511,6 @@ SetRFPowerState8190(
|
||||||
{
|
{
|
||||||
PHY_SetRtl8192eRfOff(dev);
|
PHY_SetRtl8192eRfOff(dev);
|
||||||
}
|
}
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
if (pMgntInfo->RfOffReason == RF_CHANGE_BY_IPS )
|
|
||||||
{
|
|
||||||
Adapter->HalFunc.LedControlHandler(dev,LED_CTL_NO_LINK);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Adapter->HalFunc.LedControlHandler(dev, LED_CTL_POWER_OFF);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -561,13 +561,7 @@ bool PlatformSetPMCSR(struct net_device *dev,u8 value,bool bTempSetting)
|
||||||
|
|
||||||
if (bSetFunc) {
|
if (bSetFunc) {
|
||||||
if (Buffer) {
|
if (Buffer) {
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
RT_DISABLE_FUNC(Adapter, DF_IO_D3_BIT);
|
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
RT_ENABLE_FUNC(Adapter, DF_IO_D3_BIT);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4018,9 +4018,6 @@ rtllib_MgntDisconnect(
|
||||||
}
|
}
|
||||||
if ( rtllib->iw_mode == IW_MODE_INFRA )
|
if ( rtllib->iw_mode == IW_MODE_INFRA )
|
||||||
{
|
{
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
SecClearAllKeys(Adapter);
|
|
||||||
#endif
|
|
||||||
rtllib_MgntDisconnectAP(rtllib, asRsn);
|
rtllib_MgntDisconnectAP(rtllib, asRsn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -333,12 +333,6 @@ void rtllib_tx_query_agg_cap(struct rtllib_device* ieee, struct sk_buff* skb, cb
|
||||||
return;
|
return;
|
||||||
if (is_multicast_ether_addr(hdr->addr1) || is_broadcast_ether_addr(hdr->addr1))
|
if (is_multicast_ether_addr(hdr->addr1) || is_broadcast_ether_addr(hdr->addr1))
|
||||||
return;
|
return;
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
if (pTcb->PacketLength >= 4096)
|
|
||||||
return;
|
|
||||||
if (!Adapter->HalFunc.GetNmodeSupportBySecCfgHandler(Adapter))
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (tcb_desc->bdhcp || ieee->CntAfterLink<2)
|
if (tcb_desc->bdhcp || ieee->CntAfterLink<2)
|
||||||
return;
|
return;
|
||||||
|
@ -552,22 +546,6 @@ NO_PROTECTION:
|
||||||
|
|
||||||
void rtllib_txrate_selectmode(struct rtllib_device* ieee, cb_desc* tcb_desc)
|
void rtllib_txrate_selectmode(struct rtllib_device* ieee, cb_desc* tcb_desc)
|
||||||
{
|
{
|
||||||
#ifdef TO_DO_LIST
|
|
||||||
if (!IsDataFrame(pFrame))
|
|
||||||
{
|
|
||||||
pTcb->bTxDisableRateFallBack = true;
|
|
||||||
pTcb->bTxUseDriverAssingedRate = true;
|
|
||||||
pTcb->RATRIndex = 7;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pMgntInfo->ForcedDataRate!= 0)
|
|
||||||
{
|
|
||||||
pTcb->bTxDisableRateFallBack = true;
|
|
||||||
pTcb->bTxUseDriverAssingedRate = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if (ieee->bTxDisableRateFallBack)
|
if (ieee->bTxDisableRateFallBack)
|
||||||
tcb_desc->bTxDisableRateFallBack = true;
|
tcb_desc->bTxDisableRateFallBack = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue