Commit bfb74db3 authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 02525969

drivers/staging/rtl8192e/rtl819x_HT.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -285,14 +285,6 @@ typedef struct _RT_HIGH_THROUGHPUT{ 
	u8				RxReorderPendingTime;

	u8				RxReorderPendingTime;

	u16				RxReorderDropCounter;

	u16				RxReorderDropCounter;





#ifdef USB_RX_AGGREGATION_SUPPORT

	u8				UsbRxFwAggrEn;

	u8				UsbRxFwAggrPageNum;

	u8				UsbRxFwAggrPacketNum;

	u8				UsbRxFwAggrTimeout;

	u8				UsbRxPageSize;

#endif



	u8				bIsPeerBcm;

	u8				bIsPeerBcm;





	u8				IOTPeer;

	u8				IOTPeer;

drivers/staging/rtl8192e/rtl819x_HTProc.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -93,15 +93,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee) 
	pHTInfo->bRegRxReorderEnable = 1;

	pHTInfo->bRegRxReorderEnable = 1;

	pHTInfo->RxReorderWinSize = 64;

	pHTInfo->RxReorderWinSize = 64;

	pHTInfo->RxReorderPendingTime = 30;

	pHTInfo->RxReorderPendingTime = 30;



#ifdef USB_RX_AGGREGATION_SUPPORT

	pHTInfo->UsbRxFwAggrEn = 1;

	pHTInfo->UsbRxFwAggrPageNum = 24;

	pHTInfo->UsbRxFwAggrPacketNum = 8;

	pHTInfo->UsbRxFwAggrTimeout = 8;

#endif





}

}

void HTDebugHTCapability(u8* CapIE, u8* TitleString )

void HTDebugHTCapability(u8* CapIE, u8* TitleString )

{

{

drivers/staging/rtl8192e/rtl_dm.c

+0 −43
Original line number Original line Diff line number Diff line
@@ -196,45 +196,6 @@ extern void deinit_hal_dm(struct net_device *dev) 




}

}







#ifdef USB_RX_AGGREGATION_SUPPORT

void dm_CheckRxAggregation(struct net_device *dev) {

	struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);

	PRT_HIGH_THROUGHPUT	pHTInfo = priv->rtllib->pHTInfo;

	static unsigned long	lastTxOkCnt = 0;

	static unsigned long	lastRxOkCnt = 0;

	unsigned long		curTxOkCnt = 0;

	unsigned long		curRxOkCnt = 0;



	curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt;

	curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;



	if ((curTxOkCnt + curRxOkCnt) < 15000000) {

		return;

	}



	if (curTxOkCnt > 4*curRxOkCnt) {

		if (priv->bCurrentRxAggrEnable) {

			write_nic_dword(dev, 0x1a8, 0);

			priv->bCurrentRxAggrEnable = false;

		}

	}else{

		if (!priv->bCurrentRxAggrEnable && !pHTInfo->bCurrentRT2RTAggregation) {

			u32 ulValue;

			ulValue = (pHTInfo->UsbRxFwAggrEn<<24) | (pHTInfo->UsbRxFwAggrPageNum<<16) |

				(pHTInfo->UsbRxFwAggrPacketNum<<8) | (pHTInfo->UsbRxFwAggrTimeout);

			write_nic_dword(dev, 0x1a8, ulValue);

			priv->bCurrentRxAggrEnable = true;

		}

	}



	lastTxOkCnt = priv->stats.txbytesunicast;

	lastRxOkCnt = priv->stats.rxbytesunicast;

}

#endif







extern  void    hal_dm_watchdog(struct net_device *dev)

extern  void    hal_dm_watchdog(struct net_device *dev)

{

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct r8192_priv *priv = rtllib_priv(dev);
@@ -259,10 +220,6 @@ extern void hal_dm_watchdog(struct net_device *dev) 




	dm_send_rssi_tofw(dev);

	dm_send_rssi_tofw(dev);

	dm_ctstoself(dev);

	dm_ctstoself(dev);



#ifdef USB_RX_AGGREGATION_SUPPORT

	dm_CheckRxAggregation(dev);

#endif

}

}





void dm_check_ac_dc_power(struct net_device *dev)

void dm_check_ac_dc_power(struct net_device *dev)