[packages/wl] - fix building with kerbel 4.11 - rel 6

baggins baggins at pld-linux.org
Wed May 10 00:50:15 CEST 2017


commit 94191af9db14286675b54a6876b61ecb46cc6640
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 10 00:49:59 2017 +0200

    - fix building with kerbel 4.11
    - rel 6

 linux-4.11.patch | 24 ++++++++++++++++++++++++
 wl.spec          |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index 525978a..be51f5f 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
 
 %define		_duplicate_files_terminate_build	0
 
-%define		rel	5
+%define		rel	6
 %define		pname	wl
 %define		file_ver	%(echo %{version} | tr . _)
 Summary:	Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -41,6 +41,7 @@ Patch2:		no-dead-code.patch
 Patch3:		linux-4.7.patch
 Patch4:		linux-4.8.patch
 Patch5:		17-fix-kernel-warnings.patch
+Patch6:		linux-4.11.patch
 URL:		http://www.broadcom.com/support/802.11
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -127,6 +128,7 @@ EOF\
 %patch3 -p1
 %patch4 -p1
 %patch5 -p2
+%patch6 -p1
 
 mkdir wl
 mv lib src Makefile wl/
diff --git a/linux-4.11.patch b/linux-4.11.patch
new file mode 100644
index 0000000..6ac1b48
--- /dev/null
+++ b/linux-4.11.patch
@@ -0,0 +1,24 @@
+--- wl-6.30.223.271/src/wl/sys/wl_linux.c~	2017-05-10 00:45:38.000000000 +0200
++++ wl-6.30.223.271/src/wl/sys/wl_linux.c	2017-05-10 00:46:16.265195806 +0200
+@@ -2929,7 +2929,9 @@
+ 	if (skb == NULL) return;
+ 
+ 	skb->dev = wl->monitor_dev;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ 	skb->dev->last_rx = jiffies;
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+ 	skb_reset_mac_header(skb);
+ #else
+--- wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c~	2017-05-10 00:48:08.000000000 +0200
++++ wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c	2017-05-10 00:49:17.837333867 +0200
+@@ -30,6 +30,9 @@
+ #include <linux/kthread.h>
+ #include <linux/netdevice.h>
+ #include <linux/ieee80211.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
+ #include <net/cfg80211.h>
+ #include <linux/nl80211.h>
+ #include <net/rtnetlink.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/94191af9db14286675b54a6876b61ecb46cc6640



More information about the pld-cvs-commit mailing list