commit 022d8784510b2c9af33147d8d9c2ee42d06e8310
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Thu Feb 15 01:29:31 2018 +0100
Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798
wl-kmod-012_kernel_4.15_new_timer.patch | 47 +++++++++++++++++++++++++++++++++
wl-kmod.spec | 7 ++++-
2 files changed, 53 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-012_kernel_4.15_new_timer.patch
b/wl-kmod-012_kernel_4.15_new_timer.patch
new file mode 100644
index 0000000..533e7b4
--- /dev/null
+++ b/wl-kmod-012_kernel_4.15_new_timer.patch
@@ -0,0 +1,47 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2017-06-03
15:26:57.094475000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2018-02-15
00:54:30.184690464 +0100
+@@ -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);
+
+@@ -2311,10 +2315,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);
+@@ -2366,9 +2377,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;
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 0fc636a..40a0e7d 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -27,6 +27,7 @@ Patch7: wl-kmod-008_fix_kernel_warnings.patch
Patch8: wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
Patch9: wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch
Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
+Patch11: wl-kmod-012_kernel_4.15_new_timer.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -78,6 +79,7 @@ pushd %{name}-%{version}-src
%patch8 -p1 -b .kernel_4.11_remove_last_rx_in_net_device_struct
%patch9 -p1 -b .kernel_4.12_add_cfg80211_roam_info_struct
%patch10 -p1 -b .kernel_4.14_new_kernel_read_function_prototype
+%patch11 -p1 -b .kernel_4.15_new_timer
popd
for kernel_version in %{?kernel_versions} ; do
@@ -107,6 +109,9 @@ chmod 0755
$RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Feb 15 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.271-16
+- Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798
+
* Wed Nov 29 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.271-15
- Add patch for kernel >= 4.14 from Olaf Hering - thanks to Tim Thomas
Show replies by date