Fix API change in kernel v4.15

In this kernel, the timer setup and handlers changed quite a bit.
This commit is contained in:
Christian B 2017-12-06 20:01:52 +01:00 committed by GitHub
parent 7f9dcff9bc
commit be917e7579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -269,14 +269,14 @@ __inline static void rtw_list_delete(_list *plist)
} }
#define RTW_TIMER_HDL_ARGS void *FunctionContext #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) __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->function = pfunc;
ptimer->data = (unsigned long)cntx; ptimer->data = (unsigned long)cntx;
init_timer(ptimer); init_timer(ptimer);
} }
#endif
__inline static void _set_timer(_timer *ptimer, u32 delay_time) __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)) #define STRUCT_PACKED __attribute__ ((packed))
#endif #endif