diff options
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HT.h | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_HTProc.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_softmac.c | 8 |
3 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 703d9dd..abebeda 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -285,9 +285,6 @@ typedef struct _RT_HIGH_THROUGHPUT{ u8 RxReorderPendingTime; u16 RxReorderDropCounter; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - u8 UsbTxAggrNum; -#endif #ifdef USB_RX_AGGREGATION_SUPPORT u8 UsbRxFwAggrEn; u8 UsbRxFwAggrPageNum; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 0f5410c..cb14461 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -94,9 +94,6 @@ void HTUpdateDefaultSetting(struct rtllib_device* ieee) pHTInfo->RxReorderWinSize = 64; pHTInfo->RxReorderPendingTime = 30; -#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE - pHTInfo->UsbTxAggrNum = 4; -#endif #ifdef USB_RX_AGGREGATION_SUPPORT pHTInfo->UsbRxFwAggrEn = 1; pHTInfo->UsbRxFwAggrPageNum = 24; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 9d881f4..b4279d7 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -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 */ 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]); -#endif if ((queue_len != 0) ||\ (!ieee->check_nic_enough_desc(ieee->dev,queue_index))||\ (ieee->queue_stop)) { @@ -2609,11 +2605,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee) if (queue_len < 200) #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]); -#endif }else{ kfree_skb(txb->fragments[i]); } |
