--- a/src/wl/sys/wl_linux.c 2017-12-29 23:57:29.000000000 -0400 +++ b/src/wl/sys/wl_linux.c 2017-12-30 12:32:29.518324068 -0400 @@ -93,7 +93,13 @@ #include <wlc_wowl.h> -static void wl_timer(ulong data); +static void wl_timer( +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + struct timer_list *tl +#else + ulong data +#endif + ); static void _wl_timer(wl_timer_t *t); static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); @@ -2295,9 +2301,19 @@ } static void -wl_timer(ulong data) -{ - wl_timer_t *t = (wl_timer_t *)data; +wl_timer( +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + struct timer_list *tl +#else + ulong data +#endif +) { + wl_timer_t *t = +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + from_timer(t, tl, timer); +#else + (wl_timer_t *)data; +#endif if (!WL_ALL_PASSIVE_ENAB(t->wl)) _wl_timer(t); @@ -2349,9 +2365,13 @@ bzero(t, sizeof(wl_timer_t)); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) + timer_setup(&t->timer, wl_timer, 0); +#else init_timer(&t->timer); t->timer.data = (ulong) t; t->timer.function = wl_timer; +#endif t->wl = wl; t->fn = fn; t->arg = arg;