diff options
author | Martin H | 2018-02-07 18:15:06 +0100 |
---|---|---|
committer | Martin H | 2018-02-07 18:15:06 +0100 |
commit | b54c450c343c82a921b78bce742b04a93e7c034e (patch) | |
tree | 702e54c2945e4d4857dcf65c4810c1a627e5632a /linux415.patch | |
parent | 0542e4e87172cb592b2a10042248b4720b5c55ac (diff) | |
download | aur-broadcom-wl.tar.gz |
add linux412.patch created by yegortimoshenko (https://github.com/NixOS/nixpkgs/commit/65187722ec07fec21b2c8c53019255c6a9a5c4f8)
Diffstat (limited to 'linux415.patch')
-rw-r--r-- | linux415.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/linux415.patch b/linux415.patch new file mode 100644 index 000000000000..efc8d1d5d4d2 --- /dev/null +++ b/linux415.patch @@ -0,0 +1,45 @@ +diff -urNZ a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2015-09-18 22:47:30.000000000 +0000 ++++ b/src/wl/sys/wl_linux.c 2018-01-31 22:52:10.859856221 +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); + +@@ -2298,9 +2302,15 @@ + } + + static void ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++wl_timer(struct timer_list *tl) ++{ ++ wl_timer_t *t = from_timer(t, tl, timer); ++#else + 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 +2362,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; |