From 4577d83e37175f3a334efb0ad637057ac574c5dc Mon Sep 17 00:00:00 2001
From: Zach Nedwich <znedwich@gmail.com>
Date: Tue, 6 Feb 2018 22:09:22 +1000
Subject: [PATCH] broadcom-wl-dkms 4.15 kernel patch

Closes: #11414 [via git-merge-pr]
---
 .../broadcom-wl-dkms/patches/linux-4.15.patch | 44 +++++++++++++++++++
 srcpkgs/broadcom-wl-dkms/template             |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch

diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch
new file mode 100644
index 0000000000..51c78b0591
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch
@@ -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;
diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template
index 4b6ce48bcd..d787c2cb71 100644
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@@ -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"