- fix for kernel 4.15 from arch https://bugs.archlinux.org/task/57261
[packages/wl.git] / 008-linux415.patch
1 --- a/src/wl/sys/wl_linux.c     2017-07-17 00:11:24.000000000 +0100
2 +++ b/src/wl/sys/wl_linux.c     2018-01-27 09:49:47.057799596 +0000
3 @@ -93,7 +93,11 @@
4  
5  #include <wlc_wowl.h>
6  
7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
8 +static void wl_timer(struct timer_list *tl);
9 +#else
10  static void wl_timer(ulong data);
11 +#endif
12  static void _wl_timer(wl_timer_t *t);
13  static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
14  
15 @@ -2297,10 +2301,17 @@
16         atomic_dec(&t->wl->callbacks);
17  }
18  
19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
20 +static void
21 +wl_timer(struct timer_list *tl)
22 +{
23 +       wl_timer_t *t = (wl_timer_t *)tl;
24 +#else
25  static void
26  wl_timer(ulong data)
27  {
28         wl_timer_t *t = (wl_timer_t *)data;
29 +#endif
30  
31         if (!WL_ALL_PASSIVE_ENAB(t->wl))
32                 _wl_timer(t);
33 @@ -2352,9 +2363,13 @@
34  
35         bzero(t, sizeof(wl_timer_t));
36  
37 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
38 +       timer_setup(&t->timer, wl_timer, 0);
39 +#else
40         init_timer(&t->timer);
41         t->timer.data = (ulong) t;
42         t->timer.function = wl_timer;
43 +#endif
44         t->wl = wl;
45         t->fn = fn;
46         t->arg = arg;
This page took 0.112426 seconds and 3 git commands to generate.