mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-22 21:34:37 +00:00
Code Releases Activity

Fix outdated timer_init in BTCOEX routines

Browse Source
This commit is contained in:
kimocoder 2020-07-12 00:50:47 +00:00
parent b742160fba
commit a6e3593c59
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rtw_ieee80211.c
View File

@ -1707,7 +1707,7 @@ void dump_ht_cap_ie_content(void *sel, const u8 *buf, u32 buf_len)
void dump_ht_cap_ie(void *sel, const u8 *ie, u32 ie_len) void dump_ht_cap_ie(void *sel, const u8 *ie, u32 ie_len)
{ {
const u8 *ht_cap_ie; const u8 *ht_cap_ie;
sint ht_cap_ielen; sint ht_cap_ielen = 0;
ht_cap_ie = rtw_get_ie(ie, WLAN_EID_HT_CAP, &ht_cap_ielen, ie_len); ht_cap_ie = rtw_get_ie(ie, WLAN_EID_HT_CAP, &ht_cap_ielen, ie_len);
if (!ie || ht_cap_ie != ie) if (!ie || ht_cap_ie != ie)

9
hal/hal_btcoex.c
View File

@ -721,8 +721,11 @@ struct btc_wifi_link_info halbtcoutsrc_getwifilinkinfo(PBTC_COEXIST pBtCoexist)
return wifi_link_info; return wifi_link_info;
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
static void _btmpoper_timer_hdl(void *p) static void _btmpoper_timer_hdl(void *p)
#else
static void _btmpoper_timer_hdl(struct timer_list *t)
#endif
{ {
if (GLBtcBtMpRptWait == _TRUE) { if (GLBtcBtMpRptWait == _TRUE) {
GLBtcBtMpRptWait = _FALSE; GLBtcBtMpRptWait = _FALSE;
@ -2838,7 +2841,11 @@ u8 EXhalbtcoutsrc_InitlizeVariables(void *padapter)
/* BT Control H2C/C2H*/ /* BT Control H2C/C2H*/
GLBtcBtMpOperSeq = 0; GLBtcBtMpOperSeq = 0;
_rtw_mutex_init(&GLBtcBtMpOperLock); _rtw_mutex_init(&GLBtcBtMpOperLock);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
rtw_init_timer(&GLBtcBtMpOperTimer, padapter, _btmpoper_timer_hdl, pBtCoexist); rtw_init_timer(&GLBtcBtMpOperTimer, padapter, _btmpoper_timer_hdl, pBtCoexist);
#else
timer_setup(&GLBtcBtMpOperTimer, _btmpoper_timer_hdl, 0);
#endif
_rtw_init_sema(&GLBtcBtMpRptSema, 0); _rtw_init_sema(&GLBtcBtMpRptSema, 0);
GLBtcBtMpRptSeq = 0; GLBtcBtMpRptSeq = 0;
GLBtcBtMpRptStatus = 0; GLBtcBtMpRptStatus = 0;