From a6e3593c5946c717c50ce327f386462de2e4ee11 Mon Sep 17 00:00:00 2001
From: kimocoder <christian@aircrack-ng.org>
Date: Sun, 12 Jul 2020 00:50:47 +0000
Subject: [PATCH] Fix outdated timer_init in BTCOEX routines

---
 core/rtw_ieee80211.c | 2 +-
 hal/hal_btcoex.c     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c
index 93169ff..94e3d59 100644
--- a/core/rtw_ieee80211.c
+++ b/core/rtw_ieee80211.c
@@ -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)
 {
 	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);
 	if (!ie || ht_cap_ie != ie)
diff --git a/hal/hal_btcoex.c b/hal/hal_btcoex.c
index 39bb165..bb0c3dc 100644
--- a/hal/hal_btcoex.c
+++ b/hal/hal_btcoex.c
@@ -721,8 +721,11 @@ struct btc_wifi_link_info halbtcoutsrc_getwifilinkinfo(PBTC_COEXIST pBtCoexist)
 	return wifi_link_info;
 }
 
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
 static void _btmpoper_timer_hdl(void *p)
+#else
+static void _btmpoper_timer_hdl(struct timer_list *t)
+#endif
 {
 	if (GLBtcBtMpRptWait == _TRUE) {
 		GLBtcBtMpRptWait = _FALSE;
@@ -2838,7 +2841,11 @@ u8 EXhalbtcoutsrc_InitlizeVariables(void *padapter)
 	/* BT Control H2C/C2H*/
 	GLBtcBtMpOperSeq = 0;
 	_rtw_mutex_init(&GLBtcBtMpOperLock);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
 	rtw_init_timer(&GLBtcBtMpOperTimer, padapter, _btmpoper_timer_hdl, pBtCoexist);
+#else
+	timer_setup(&GLBtcBtMpOperTimer, _btmpoper_timer_hdl, 0);
+#endif
 	_rtw_init_sema(&GLBtcBtMpRptSema, 0);
 	GLBtcBtMpRptSeq = 0;
 	GLBtcBtMpRptStatus = 0;