diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c --- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2017-06-03 15:26:57.094475000 +0200 +++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2018-02-15 00:54:30.184690464 +0100 @@ -93,7 +93,11 @@ #include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) +static void wl_timer(struct timer_list *tl); +#else static void wl_timer(ulong data); +#endif static void _wl_timer(wl_timer_t *t); static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); @@ -2311,10 +2315,17 @@ atomic_dec(&t->wl->callbacks); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) +static void +wl_timer(struct timer_list *tl) +{ + wl_timer_t *t = (wl_timer_t *)tl; +#else static void wl_timer(ulong data) { wl_timer_t *t = (wl_timer_t *)data; +#endif if (!WL_ALL_PASSIVE_ENAB(t->wl)) _wl_timer(t); @@ -2366,9 +2377,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;