diff --git a/[refs] b/[refs] index 5c392c02d7aa..83f1c7379308 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc04b462dd87574f7c7da0bb98f444f32e6c5e44 +refs/heads/master: 318f591f086ec091bd1d4cdeed3b130625ff2242 diff --git a/trunk/drivers/staging/rtl8192e/r8192E_dm.c b/trunk/drivers/staging/rtl8192e/r8192E_dm.c index 0f7bc5234902..75c243664062 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_dm.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_dm.c @@ -189,21 +189,6 @@ void dm_CheckRxAggregation(struct net_device *dev) { unsigned long curTxOkCnt = 0; unsigned long curRxOkCnt = 0; -/* - if (pHalData->bForcedUsbRxAggr) { - if (pHalData->ForcedUsbRxAggrInfo == 0) { - if (pHalData->bCurrentRxAggrEnable) { - Adapter->HalFunc.HalUsbRxAggrHandler(Adapter, FALSE); - } - } else { - if (!pHalData->bCurrentRxAggrEnable || (pHalData->ForcedUsbRxAggrInfo != pHalData->LastUsbRxAggrInfoSetting)) { - Adapter->HalFunc.HalUsbRxAggrHandler(Adapter, TRUE); - } - } - return; - } - -*/ curTxOkCnt = priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt = priv->stats.rxbytesunicast - lastRxOkCnt;