5 p.m.
commit 55ac30bd50a3e7ddb7e1db89eccb210fcb56ae8a
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Mon Apr 10 18:46:46 2017 +0200
Add patch for kernel >= 4.11 - remove last_rx reference in net_device struct
rfbz#4503
Add elfutils-libelf-devel to BuildRequires
..._4.11_remove_last_rx_in_net_device_struct.patch | 27 ++++++++++++++++++++++
wl-kmod.spec | 9 +++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
b/wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
new file mode 100644
index 0000000..4d46d04
--- /dev/null
+++ b/wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
@@ -0,0 +1,27 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c
hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c
+---
hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-02-08
19:35:44.320100235 +0100
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2017-04-10
14:23:40.909434506 +0200
+@@ -39,6 +39,10 @@
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
++
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+ #define EVENT_STATUS(e) dtoh32((e)->status)
+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 2016-08-26
08:24:32.558643000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2017-04-10
14:23:40.884434339 +0200
+@@ -2929,7 +2929,9 @@
+ if (skb == NULL) return;
+
+ skb->dev = wl->monitor_dev;
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 10, 0)
+ skb->dev->last_rx = jiffies;
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+ skb_reset_mac_header(skb);
+ #else
diff --git a/wl-kmod.spec b/wl-kmod.spec
index f7150a1..03e99da 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,8 +24,10 @@ Patch4:
wl-kmod-005_kernel_4.7_IEEE80211_BAND_to_NL80211_BAND.patch
Patch5: wl-kmod-006_gcc_6_fix_indentation_warnings.patch
Patch6: wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch
Patch7: wl-kmod-008_fix_kernel_warnings.patch
+Patch8: wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
BuildRequires: %{_bindir}/kmodtool
+BuildRequires: elfutils-libelf-devel
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -70,6 +72,7 @@ pushd %{name}-%{version}-src
%patch5 -p1 -b .gcc_6_fix_indentation_warnings
%patch6 -p1 -b .kernel_4.8_add_cfg80211_scan_info_struct
%patch7 -p1 -b .fix_kernel_warnings
+%patch8 -p1 -b .kernel_4.11_remove_last_rx_in_net_device_struct
popd
for kernel_version in %{?kernel_versions} ; do
@@ -99,6 +102,10 @@ chmod 0755
$RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Apr 10 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.271-9
+- Add patch for kernel >= 4.11 - remove last_rx reference in net_device struct
rfbz#4503
+- Add elfutils-libelf-devel to BuildRequires
+
* Wed Feb 08 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.271-8
- Add patch to fix kernel warnings - thanks to Adrien Bustany rfbz#4427
- Updated URLs to new Broadcom WEB site