mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-25 00:16:45 +00:00
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
From a893fac9b9e883f39a545e8ce87926cecc26ba12 Mon Sep 17 00:00:00 2001
|
|
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
|
Date: Sun, 10 Jun 2018 19:13:17 +0100
|
|
Subject: [PATCH] add 4.15.y support
|
|
|
|
Credit: https://github.com/UnitedRPMs/broadcom-wl-dkms/blob/5147b5f1867273e2762f777fd724b6523c3ab8dd/008-linux415.patch
|
|
---
|
|
x86-64/src/wl/sys/wl_linux.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
diff --git a/x86-32/src/wl/sys/wl_linux.c b/x86-32/src/wl/sys/wl_linux.c
|
|
index f7149da..89a3831 100644
|
|
--- a/x86-32/src/wl/sys/wl_linux.c
|
|
+++ b/x86-32/src/wl/sys/wl_linux.c
|
|
@@ -97,7 +97,11 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev);
|
|
|
|
#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);
|
|
|
|
@@ -2296,10 +2300,17 @@ wl_timer_task(wl_task_t *task)
|
|
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);
|
|
@@ -2351,9 +2362,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)(void *arg), void *arg, const char *tname
|
|
|
|
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;
|
|
--
|
|
2.14.1
|
|
|