From be917e7579be51460c3cbc969e0f0bf7dea68167 Mon Sep 17 00:00:00 2001 From: Christian B Date: Wed, 6 Dec 2017 20:01:52 +0100 Subject: [PATCH] Fix API change in kernel v4.15 In this kernel, the timer setup and handlers changed quite a bit. --- include/osdep_service_linux.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h index f371343..342c2aa 100644 --- a/include/osdep_service_linux.h +++ b/include/osdep_service_linux.h @@ -269,14 +269,14 @@ __inline static void rtw_list_delete(_list *plist) } #define RTW_TIMER_HDL_ARGS void *FunctionContext - +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) __inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void *cntx) { - /* setup_timer(ptimer, pfunc,(u32)cntx); */ ptimer->function = pfunc; ptimer->data = (unsigned long)cntx; init_timer(ptimer); } +#endif __inline static void _set_timer(_timer *ptimer, u32 delay_time) { @@ -429,5 +429,4 @@ extern struct net_device *rtw_alloc_etherdev(int sizeof_priv); #define STRUCT_PACKED __attribute__ ((packed)) - #endif