diff options
author | 2009-07-03 16:06:47 +0200 | |
---|---|---|
committer | 2009-09-15 12:01:37 -0700 | |
commit | 5b36d3bfbcf0afbc6dd49375fcd088103f6af0ac (patch) | |
tree | b0395a406341d072f42235de7004b6b7eea036f1 /drivers/staging/rtl8192su/ieee80211 | |
parent | Staging: rtl8192su: remove USB_RX_AGGREGATION_SUPPORT ifdefs (diff) | |
download | linux-dev-5b36d3bfbcf0afbc6dd49375fcd088103f6af0ac.tar.xz linux-dev-5b36d3bfbcf0afbc6dd49375fcd088103f6af0ac.zip |
Staging: rtl8192su: remove USB_TX_DRIVER_AGGREGATION_ENABLE ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su/ieee80211')
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | 8 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 3 |
3 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c index e10060fc47d1..5dc1bd36352a 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c @@ -2237,11 +2237,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * #if 1 /* if xmit available, just xmit it immediately, else just insert it to the wait queue */ for(i = 0; i < txb->nr_frags; i++) { -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0) || -#else if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0) || -#endif (!ieee->check_nic_enough_desc(ieee->dev,queue_index))||\ (ieee->queue_stop)) { /* insert the skb packet to the wait queue */ @@ -2250,11 +2246,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * * */ //printk("error:no descriptor left@queue_index %d, %d, %d\n", queue_index, skb_queue_len(&ieee->skb_waitQ[queue_index]), ieee->check_nic_enough_desc(ieee->dev,queue_index)); //ieee80211_stop_queue(ieee); -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - skb_queue_tail(&ieee->skb_drv_aggQ[queue_index], txb->fragments[i]); -#else skb_queue_tail(&ieee->skb_waitQ[queue_index], txb->fragments[i]); -#endif }else{ ieee->softmac_data_hard_start_xmit( txb->fragments[i], diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h b/drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h index 22a3d450287b..a97c901edbf5 100644 --- a/drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h +++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h @@ -324,9 +324,6 @@ typedef struct _RT_HIGH_THROUGHPUT{ u8 RxReorderPendingTime; u16 RxReorderDropCounter; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - u8 UsbTxAggrNum; -#endif // Add for Broadcom(Linksys) IOT. Joseph u8 bIsPeerBcm; diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c index eca9ac27c2c6..ed5367dc1942 100644 --- a/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c @@ -102,9 +102,6 @@ void HTUpdateDefaultSetting(struct ieee80211_device* ieee) pHTInfo->RxReorderWinSize = 64; pHTInfo->RxReorderPendingTime = 30; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - pHTInfo->UsbTxAggrNum = 4; -#endif } |