diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-02-20 10:03:20 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-23 17:10:09 -0500 |
commit | 51de57ef21fd9fda1586d0c0a3e77e0dfdcb131a (patch) | |
tree | e4bfbaaaf9fade1e48b2a654093901ed08f0002f /drivers/staging/rtl8192e | |
parent | 668c711bfd80e96c0ee92c2c098b81de62bbf7d3 (diff) |
staging: rtl8192e: Remove USB related code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_dm.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_dm.c b/drivers/staging/rtl8192e/r8192E_dm.c index ec09d9a80f7..20b201d0401 100644 --- a/drivers/staging/rtl8192e/r8192E_dm.c +++ b/drivers/staging/rtl8192e/r8192E_dm.c | |||
@@ -153,48 +153,6 @@ void deinit_hal_dm(struct net_device *dev) | |||
153 | 153 | ||
154 | } | 154 | } |
155 | 155 | ||
156 | |||
157 | #ifdef USB_RX_AGGREGATION_SUPPORT | ||
158 | void dm_CheckRxAggregation(struct net_device *dev) { | ||
159 | struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev); | ||
160 | PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo; | ||
161 | static unsigned long lastTxOkCnt = 0; | ||
162 | static unsigned long lastRxOkCnt = 0; | ||
163 | unsigned long curTxOkCnt = 0; | ||
164 | unsigned long curRxOkCnt = 0; | ||
165 | |||
166 | curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; | ||
167 | curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt; | ||
168 | |||
169 | if((curTxOkCnt + curRxOkCnt) < 15000000) { | ||
170 | return; | ||
171 | } | ||
172 | |||
173 | if(curTxOkCnt > 4*curRxOkCnt) { | ||
174 | if (priv->bCurrentRxAggrEnable) { | ||
175 | write_nic_dword(priv, 0x1a8, 0); | ||
176 | priv->bCurrentRxAggrEnable = false; | ||
177 | } | ||
178 | }else{ | ||
179 | if (!priv->bCurrentRxAggrEnable && !pHTInfo->bCurrentRT2RTAggregation) { | ||
180 | u32 ulValue; | ||
181 | ulValue = (pHTInfo->UsbRxFwAggrEn<<24) | (pHTInfo->UsbRxFwAggrPageNum<<16) | | ||
182 | (pHTInfo->UsbRxFwAggrPacketNum<<8) | (pHTInfo->UsbRxFwAggrTimeout); | ||
183 | /* | ||
184 | * If usb rx firmware aggregation is enabled, | ||
185 | * when anyone of three threshold conditions above is reached, | ||
186 | * firmware will send aggregated packet to driver. | ||
187 | */ | ||
188 | write_nic_dword(priv, 0x1a8, ulValue); | ||
189 | priv->bCurrentRxAggrEnable = true; | ||
190 | } | ||
191 | } | ||
192 | |||
193 | lastTxOkCnt = priv->stats.txbytesunicast; | ||
194 | lastRxOkCnt = priv->stats.rxbytesunicast; | ||
195 | } | ||
196 | #endif | ||
197 | |||
198 | void hal_dm_watchdog(struct net_device *dev) | 156 | void hal_dm_watchdog(struct net_device *dev) |
199 | { | 157 | { |
200 | /*Add by amy 2008/05/15 ,porting from windows code.*/ | 158 | /*Add by amy 2008/05/15 ,porting from windows code.*/ |
@@ -216,10 +174,6 @@ void hal_dm_watchdog(struct net_device *dev) | |||
216 | dm_check_pbc_gpio(dev); | 174 | dm_check_pbc_gpio(dev); |
217 | dm_send_rssi_tofw(dev); | 175 | dm_send_rssi_tofw(dev); |
218 | dm_ctstoself(dev); | 176 | dm_ctstoself(dev); |
219 | |||
220 | #ifdef USB_RX_AGGREGATION_SUPPORT | ||
221 | dm_CheckRxAggregation(dev); | ||
222 | #endif | ||
223 | } | 177 | } |
224 | 178 | ||
225 | 179 | ||