mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2025-01-10 16:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from kimocoder/v5.1.5

Browse Source 
Fix compilation errors/crashes
This commit is contained in:
evilphish 2017-12-07 10:59:20 +01:00 committed by GitHub
commit ae795438e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/rtw_recv.c
View File

@ -498,7 +498,6 @@ sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe)
pframe = precvframe->u.hdr.rx_data; pframe = precvframe->u.hdr.rx_data;
payload = pframe + prxattrib->hdrlen + prxattrib->iv_len; payload = pframe + prxattrib->hdrlen + prxattrib->iv_len;
/* rtw_seccalctkipmic(&stainfo->dot11tkiprxmickey.skey[0],pframe,payload, datalen ,&miccode[0],(unsigned char)prxattrib->priority); */ /* care the length of the data */ /* rtw_seccalctkipmic(&stainfo->dot11tkiprxmickey.skey[0],pframe,payload, datalen ,&miccode[0],(unsigned char)prxattrib->priority); */ /* care the length of the data */
rtw_seccalctkipmic(mickey, pframe, payload, datalen , &miccode[0], (unsigned char)prxattrib->priority); /* care the length of the data */ rtw_seccalctkipmic(mickey, pframe, payload, datalen , &miccode[0], (unsigned char)prxattrib->priority); /* care the length of the data */
@ -875,7 +874,6 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
} }
#endif #endif
} }
@ -4231,8 +4229,8 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS)
} }
if (num_signal_strength == 0) { if (num_signal_strength == 0) {
if (rtw_get_on_cur_ch_time(adapter) == 0 if (rtw_get_on_cur_ch_time(padapter) == 0
|| rtw_get_passing_time_ms(rtw_get_on_cur_ch_time(adapter)) < 2 * adapter->mlmeextpriv.mlmext_info.bcn_interval || rtw_get_passing_time_ms(rtw_get_on_cur_ch_time(padapter)) < 2 * padapter->mlmeextpriv.mlmext_info.bcn_interval
) )
goto set_timer; goto set_timer;
} }
@ -4295,9 +4293,8 @@ set_timer:
_set_timer(&recvpriv->signal_stat_timer, recvpriv->signal_stat_sampling_interval); _set_timer(&recvpriv->signal_stat_timer, recvpriv->signal_stat_sampling_interval);
#else #else
rtw_set_signal_stat_timer(recvpriv); rtw_set_signal_stat_timer(recvpriv);
#endif
}
#endif /* CONFIG_NEW_SIGNAL_STAT_PROCESS */ #endif /* CONFIG_NEW_SIGNAL_STAT_PROCESS */
}
static void rx_process_rssi(_adapter *padapter, union recv_frame *prframe) static void rx_process_rssi(_adapter *padapter, union recv_frame *prframe)
{ {