From 66aa3863cff4c6856457efd4c427cdeaf32ae74a Mon Sep 17 00:00:00 2001 From: Christian kimocoder Date: Tue, 3 Oct 2017 18:50:32 +0200 Subject: [PATCH] Revert "Importing some tweaks + typo" --- Makefile | 2 +- core/rtw_mlme_ext.c | 7 ++++--- hal/rtl8814a/usb/rtl8814au_xmit.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 21adc28..95fb97a 100755 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ CONFIG_HIGH_ACTIVE = n CONFIG_PNO_SUPPORT = n CONFIG_PNO_SET_DEBUG = n CONFIG_AP_WOWLAN = n -######### Notify SDIO Host Keep Power During Suspend ########## +######### Notify SDIO Host Keep Power During Syspend ########## CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### CONFIG_MP_VHT_HW_TX_MODE = n diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 9537b2e..37bdfbf 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -12276,13 +12276,14 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer) ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1); else issue_del_ba(padapter, psta->hwaddr, i, 39, 0); - psta->recvreorder_ctrl[i].enable = _FALSE; + psta->recvreorder_ctrl[i].enable = _FALSE; if (ret != _FAIL) psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID; - rtw_reset_continual_no_rx_packet(psta, i); + rtw_reset_continual_no_rx_packet(psta, i); + } } } - } else{ + else{ /* The inactivity timer is reset when MPDUs to the TID is received. */ rtw_reset_continual_no_rx_packet(psta, i); } diff --git a/hal/rtl8814a/usb/rtl8814au_xmit.c b/hal/rtl8814a/usb/rtl8814au_xmit.c index f176358..ba53693 100644 --- a/hal/rtl8814a/usb/rtl8814au_xmit.c +++ b/hal/rtl8814a/usb/rtl8814au_xmit.c @@ -626,11 +626,11 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv // check pkt amount in one bulk descCount = 0; bulkPtr = bulkSize; - if (pbuf < bulkPtr) { + if (pbuf < bulkPtr) descCount++; if (descCount == pHalData->UsbTxAggDescNum) goto agg_end; - } else { + else { descCount = 0; bulkPtr = ((pbuf / bulkSize) + 1) * bulkSize; // round to next bulkSize }