Fix indentation that produced warnings

This commit is contained in:
Maxim Buzdalov 2019-07-08 03:31:19 +03:00
parent d6aa91a728
commit 01b808713a
2 changed files with 40 additions and 30 deletions

View File

@ -12420,18 +12420,26 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
for (i = 0; i < TID_NUM ; i++) { for (i = 0; i < TID_NUM ; i++) {
if ((psta->recvreorder_ctrl[i].enable) && if ((psta->recvreorder_ctrl[i].enable) &&
(sta_rx_data_qos_pkts(psta, i) == sta_last_rx_data_qos_pkts(psta, i)) ) { (sta_rx_data_qos_pkts(psta, i) == sta_last_rx_data_qos_pkts(psta, i)) ) {
if (_TRUE == rtw_inc_and_chk_continual_no_rx_packet(psta, i)) { if (_TRUE == rtw_inc_and_chk_continual_no_rx_packet(psta, i)) {
/* send a DELBA frame to the peer STA with the Reason Code field set to TIMEOUT */ /* send a DELBA frame to the peer STA with the Reason Code field set to TIMEOUT */
if (!from_timer) if (!from_timer)
ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1); {
else ret = issue_del_ba_ex(padapter, psta->hwaddr, i, 39, 0, 3, 1);
issue_del_ba(padapter, psta->hwaddr, i, 39, 0);
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);
} }
}else{ else
{
issue_del_ba(padapter, psta->hwaddr, i, 39, 0);
}
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);
}
}
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

@ -1506,8 +1506,7 @@ _func_enter_;
((frtype|frsubtype) == WIFI_DATA_CFACKPOLL)) ((frtype|frsubtype) == WIFI_DATA_CFACKPOLL))
{ {
qc_exists = 1; qc_exists = 1;
if(hdrlen != WLAN_HDR_A3_QOS_LEN){ if(hdrlen != WLAN_HDR_A3_QOS_LEN){
hdrlen += 2; hdrlen += 2;
} }
} }
@ -1519,8 +1518,7 @@ _func_enter_;
(frsubtype == 0x0b))) (frsubtype == 0x0b)))
{ {
if(hdrlen != WLAN_HDR_A3_QOS_LEN){ if(hdrlen != WLAN_HDR_A3_QOS_LEN){
hdrlen += 2;
hdrlen += 2;
} }
qc_exists = 1; qc_exists = 1;
} }
@ -1596,9 +1594,11 @@ _func_enter_;
/* Insert MIC into payload */ /* Insert MIC into payload */
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j]; {
pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j];
}
payload_index = hdrlen + 8; payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++) for (i=0; i< num_blocks; i++)
{ {
construct_ctr_preload( construct_ctr_preload(
@ -1982,9 +1982,11 @@ _func_enter_;
/* Insert MIC into payload */ /* Insert MIC into payload */
for (j = 0; j < 8; j++) for (j = 0; j < 8; j++)
message[payload_index+j] = mic[j]; {
message[payload_index+j] = mic[j];
}
payload_index = hdrlen + 8; payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++) for (i=0; i< num_blocks; i++)
{ {
construct_ctr_preload( construct_ctr_preload(