---

yaml --- r: 267675 b: refs/heads/master c: bfb74db h: refs/heads/master i: 267673: 7a6ce1c 267671: 9b5cfa1 v: v3
git-mirror · Aug 24, 2011 · 309adf5 · 309adf5
1 parent 71f6f4b
commit 309adf5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 61 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02525969666f1fe4718705d372afaafa9d12b612
+refs/heads/master: bfb74db3e58c6362d877b299e5b68c512fc500db
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_HT.h b/trunk/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -285,14 +285,6 @@ typedef struct _RT_HIGH_THROUGHPUT{
 	u8				RxReorderPendingTime;
 	u16				RxReorderDropCounter;
 
-#ifdef USB_RX_AGGREGATION_SUPPORT
-	u8				UsbRxFwAggrEn;
-	u8				UsbRxFwAggrPageNum;
-	u8				UsbRxFwAggrPacketNum;
-	u8				UsbRxFwAggrTimeout;
-	u8				UsbRxPageSize;
-#endif
-
 	u8				bIsPeerBcm;
 
 	u8				IOTPeer;

diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_HTProc.c b/trunk/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -93,15 +93,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee)
 	pHTInfo->bRegRxReorderEnable = 1;
 	pHTInfo->RxReorderWinSize = 64;
 	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 )
 {

diff --git a/trunk/drivers/staging/rtl8192e/rtl_dm.c b/trunk/drivers/staging/rtl8192e/rtl_dm.c
@@ -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)
 {
 	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_ctstoself(dev);
-
-#ifdef USB_RX_AGGREGATION_SUPPORT
-	dm_CheckRxAggregation(dev);
-#endif
 }
 
 void dm_check_ac_dc_power(struct net_device *dev)