Commit bf474281 authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 68aee803
...@@ -285,9 +285,6 @@ typedef struct _RT_HIGH_THROUGHPUT{ ...@@ -285,9 +285,6 @@ typedef struct _RT_HIGH_THROUGHPUT{
u8 RxReorderPendingTime; u8 RxReorderPendingTime;
u16 RxReorderDropCounter; u16 RxReorderDropCounter;
#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
u8 UsbTxAggrNum;
#endif
#ifdef USB_RX_AGGREGATION_SUPPORT #ifdef USB_RX_AGGREGATION_SUPPORT
u8 UsbRxFwAggrEn; u8 UsbRxFwAggrEn;
u8 UsbRxFwAggrPageNum; u8 UsbRxFwAggrPageNum;
......
...@@ -94,9 +94,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee) ...@@ -94,9 +94,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee)
pHTInfo->RxReorderWinSize = 64; pHTInfo->RxReorderWinSize = 64;
pHTInfo->RxReorderPendingTime = 30; pHTInfo->RxReorderPendingTime = 30;
#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
pHTInfo->UsbTxAggrNum = 4;
#endif
#ifdef USB_RX_AGGREGATION_SUPPORT #ifdef USB_RX_AGGREGATION_SUPPORT
pHTInfo->UsbRxFwAggrEn = 1; pHTInfo->UsbRxFwAggrEn = 1;
pHTInfo->UsbRxFwAggrPageNum = 24; pHTInfo->UsbRxFwAggrPageNum = 24;
......
...@@ -2591,11 +2591,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) ...@@ -2591,11 +2591,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
/* if xmit available, just xmit it immediately, else just insert it to the wait queue */ /* if xmit available, just xmit it immediately, else just insert it to the wait queue */
for (i = 0; i < txb->nr_frags; i++) { for (i = 0; i < txb->nr_frags; i++) {
#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
queue_len = skb_queue_len(&ieee->skb_drv_aggQ[queue_index]);
#else
queue_len = skb_queue_len(&ieee->skb_waitQ[queue_index]); queue_len = skb_queue_len(&ieee->skb_waitQ[queue_index]);
#endif
if ((queue_len != 0) ||\ if ((queue_len != 0) ||\
(!ieee->check_nic_enough_desc(ieee->dev,queue_index))||\ (!ieee->check_nic_enough_desc(ieee->dev,queue_index))||\
(ieee->queue_stop)) { (ieee->queue_stop)) {
...@@ -2609,11 +2605,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) ...@@ -2609,11 +2605,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
if (queue_len < 200) if (queue_len < 200)
#endif #endif
{ {
#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]); skb_queue_tail(&ieee->skb_waitQ[queue_index], txb->fragments[i]);
#endif
}else{ }else{
kfree_skb(txb->fragments[i]); kfree_skb(txb->fragments[i]);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment