mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-11-12 17:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix API change in kernel 4.15

Browse Source 
In this kernel, the timer setup and handlers changed quite a bit.
This commit is contained in:
Christian B 2017-12-06 19:34:12 +01:00 committed by GitHub
parent 269158785a
commit 8be9e78a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/rtw_tdls.c
View File

@ -3141,9 +3141,17 @@ void rtw_build_tunneled_probe_rsp_ies(_adapter *padapter, struct xmit_frame *pxm
}
#endif /* CONFIG_WFD */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
void _tdls_tpk_timer_hdl(struct timer_list *t)
#else
void _tdls_tpk_timer_hdl(void *FunctionContext)
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
struct sta_info *ptdls_sta = from_timer(ptdls_sta, t, sta.TPK_timer);
#else
struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext;
#endif
struct tdls_txmgmt txmgmt;
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));
@ -3246,7 +3254,11 @@ void _tdls_pti_timer_hdl(void *FunctionContext)
void rtw_init_tdls_timer(_adapter *padapter, struct sta_info *psta)
{
psta->padapter = padapter;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
timer_setup(&psta->TPK_timer, _TPK_timer_hdl, 0);
#else
_init_timer(&psta->TPK_timer, padapter->pnetdev, _tdls_tpk_timer_hdl, psta);
#endif
#ifdef CONFIG_TDLS_CH_SW
_init_timer(&psta->ch_sw_timer, padapter->pnetdev, _tdls_ch_switch_timer_hdl, psta);
_init_timer(&psta->delay_timer, padapter->pnetdev, _tdls_delay_timer_hdl, psta);