[packages/wl] - fix building with kernel 5.9 - rel 11

baggins baggins at pld-linux.org
Wed Oct 21 08:43:41 CEST 2020


commit 4b51e5e3428076c13a638348763b1dc1e6367b06
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Oct 21 08:43:24 2020 +0200

    - fix building with kernel 5.9
    - rel 11

 linux-5.9.patch | 14 ++++++++++++++
 wl.spec         |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index 6b838b3..2045373 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
 
 %define		_duplicate_files_terminate_build	0
 
-%define		rel	10
+%define		rel	11
 %define		pname	wl
 %define		file_ver	%(echo %{version} | tr . _)
 Summary:	Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -46,6 +46,7 @@ Patch7:		linux-4.12.patch
 Patch8:		008-linux415.patch
 Patch9:		linux-5.1.patch
 Patch10:	linux-5.6.patch
+Patch11:	linux-5.9.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}}
@@ -137,6 +138,7 @@ EOF\
 %patch8 -p1
 %patch9 -p1
 %patch10 -p2
+%patch11 -p2
 
 mkdir wl
 mv lib src Makefile wl/
diff --git a/linux-5.9.patch b/linux-5.9.patch
new file mode 100644
index 0000000..1e50791
--- /dev/null
+++ b/linux-5.9.patch
@@ -0,0 +1,14 @@
+--- wl-6.30.223.271/wl/src/wl/sys/wl_linux.c~	2020-10-21 08:40:00.000000000 +0200
++++ wl-6.30.223.271/wl/src/wl/sys/wl_linux.c	2020-10-21 08:41:58.566248630 +0200
+@@ -1662,7 +1662,11 @@
+ 		goto done2;
+ 	}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++	if (uaccess_kernel())
++#else
+ 	if (segment_eq(get_fs(), KERNEL_DS))
++#endif
+ 		buf = ioc.buf;
+ 
+ 	else if (ioc.buf) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/4b51e5e3428076c13a638348763b1dc1e6367b06



More information about the pld-cvs-commit mailing list