1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- --- a/src/wl/sys/wl_linux.c 2017-07-17 00:11:24.000000000 +0100
- +++ b/src/wl/sys/wl_linux.c 2018-01-27 09:49:47.057799596 +0000
- @@ -93,7 +93,11 @@
-
- #include <wlc_wowl.h>
-
- +#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);
-
- @@ -2297,10 +2301,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);
- @@ -2352,9 +2363,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;
|