1
0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-25 14:44:09 +00:00

Merge pull request #19 from kimocoder/v4.3.21

Importing some tweaks + typo
Fix some conditional statements (missing braces)
This commit is contained in:
Christian kimocoder 2017-10-03 08:08:45 +02:00 committed by GitHub
commit 7b13646b28
3 changed files with 6 additions and 7 deletions

View File

@ -73,7 +73,7 @@ CONFIG_HIGH_ACTIVE = n
CONFIG_PNO_SUPPORT = n CONFIG_PNO_SUPPORT = n
CONFIG_PNO_SET_DEBUG = n CONFIG_PNO_SET_DEBUG = n
CONFIG_AP_WOWLAN = n CONFIG_AP_WOWLAN = n
######### Notify SDIO Host Keep Power During Syspend ########## ######### Notify SDIO Host Keep Power During Suspend ##########
CONFIG_RTW_SDIO_PM_KEEP_POWER = y CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### MP HW TX MODE FOR VHT ####################### ###################### MP HW TX MODE FOR VHT #######################
CONFIG_MP_VHT_HW_TX_MODE = n CONFIG_MP_VHT_HW_TX_MODE = n

View File

@ -12282,8 +12282,7 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
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. */ /* The inactivity timer is reset when MPDUs to the TID is received. */
rtw_reset_continual_no_rx_packet(psta, i); rtw_reset_continual_no_rx_packet(psta, i);
} }

View File

@ -626,11 +626,11 @@ s32 rtl8814au_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
// check pkt amount in one bulk // check pkt amount in one bulk
descCount = 0; descCount = 0;
bulkPtr = bulkSize; bulkPtr = bulkSize;
if (pbuf < bulkPtr) if (pbuf < bulkPtr) {
descCount++; descCount++;
if (descCount == pHalData->UsbTxAggDescNum) if (descCount == pHalData->UsbTxAggDescNum)
goto agg_end; goto agg_end;
else { } else {
descCount = 0; descCount = 0;
bulkPtr = ((pbuf / bulkSize) + 1) * bulkSize; // round to next bulkSize bulkPtr = ((pbuf / bulkSize) + 1) * bulkSize; // round to next bulkSize
} }