diff options
author | graysky | 2018-02-18 12:16:39 -0500 |
---|---|---|
committer | graysky | 2018-02-18 12:16:39 -0500 |
commit | 7b1ebe197ee7d8c3ac5397ac3c3938b6d69c7569 (patch) | |
tree | 865c167769b37faa8f4fad26484a587ab2a02ce0 /008-linux415.patch | |
parent | 4f9474ca5d01a8a9a5d71139c4566c7a472fff8b (diff) | |
download | aur-7b1ebe197ee7d8c3ac5397ac3c3938b6d69c7569.tar.gz |
Update to 6.30.223.271-69
Diffstat (limited to '008-linux415.patch')
-rw-r--r-- | 008-linux415.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/008-linux415.patch b/008-linux415.patch new file mode 100644 index 000000000000..1bced2f68ab1 --- /dev/null +++ b/008-linux415.patch @@ -0,0 +1,46 @@ +--- 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; |