broadcom-wl-dkms 4.15 kernel patch

Closes: #11414 [via git-merge-pr]
This commit is contained in:
Zach Nedwich 2018-02-06 22:09:22 +10:00 committed by Jürgen Buchmüller
parent e23392c304
commit 4577d83e37
2 changed files with 45 additions and 1 deletions

View file

@ -0,0 +1,44 @@
--- src/wl/sys/wl_linux.c 2018-01-31 11:33:26.000000000 +0100
+++ src/wl/sys/wl_linux.c 2018-01-31 15:27:18.000000000 +0100
@@ -93,7 +93,11 @@
#include <wlc_wowl.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
static void wl_timer(ulong data);
+#else
+static void wl_timer(struct timer_list *tl);
+#endif
static void _wl_timer(wl_timer_t *t);
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
@@ -2301,9 +2305,17 @@
}
static void
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
wl_timer(ulong data)
+#else
+wl_timer(struct timer_list *tl)
+#endif
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
wl_timer_t *t = (wl_timer_t *)data;
+#else
+ wl_timer_t *t = from_timer(t, tl, timer);
+#endif
if (!WL_ALL_PASSIVE_ENAB(t->wl))
_wl_timer(t);
@@ -2355,7 +2367,11 @@
bzero(t, sizeof(wl_timer_t));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
init_timer(&t->timer);
t->timer.data = (ulong) t;
t->timer.function = wl_timer;
+#else
+ timer_setup(&t->timer, wl_timer, 0);
+#endif
t->wl = wl;

View file

@ -2,7 +2,7 @@
pkgname=broadcom-wl-dkms
version=6.30.223.271
revision=6
revision=7
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="Proprietary Broadcom license"
homepage="http://broadcom.com"