diff options
Diffstat (limited to 'package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch')
-rw-r--r-- | package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch b/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch deleted file mode 100644 index 66eba968cf..0000000000 --- a/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/driver/wl_linux.c -+++ b/driver/wl_linux.c -@@ -235,7 +235,11 @@ struct wl_info { - - }; - -+#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); - - #ifdef WLC_HIGH_ONLY -@@ -2512,6 +2516,18 @@ wl_timer_task(wl_task_t *task) - } - #endif /* WLC_HIGH_ONLY */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -+static void -+wl_timer(struct timer_list *tl) -+{ -+ wl_timer_t *t = from_timer(t, tl, timer); -+#ifndef WLC_HIGH_ONLY -+ _wl_timer(t); -+#else -+ wl_schedule_task(t->wl, wl_timer_task, t); -+#endif /* WLC_HIGH_ONLY */ -+} -+#else - static void - wl_timer(ulong data) - { -@@ -2522,6 +2538,7 @@ wl_timer(ulong data) - wl_schedule_task(t->wl, wl_timer_task, t); - #endif /* WLC_HIGH_ONLY */ - } -+#endif /* linux >= 4.15.0 */ - - static void - _wl_timer(wl_timer_t *t) -@@ -2573,9 +2590,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)( - - 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; |