[wl-kmod] Add patch for kernel >= 5.9 - fixes RFBZ#5835

commit c4602e64a43c2659cc19f8b2e83c913492ee02f0 Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; Date: Wed Nov 11 18:28:19 2020 +0100 Add patch for kernel >= 5.9 - fixes RFBZ#5835 wl-kmod-019_kernel_5.9_segment_eq_removed.patch | 15 +++++++++++++++ wl-kmod.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/wl-kmod-019_kernel_5.9_segment_eq_removed.patch b/wl-kmod-019_kernel_5.9_segment_eq_removed.patch new file mode 100644 index 0000000..592be93 --- /dev/null +++ b/wl-kmod-019_kernel_5.9_segment_eq_removed.patch @@ -0,0 +1,15 @@ +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 2020-03-19 10:24:18.154395810 +0100 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2020-11-11 13:39:00.579562572 +0100 +@@ -1659,7 +1659,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) { diff --git a/wl-kmod.spec b/wl-kmod.spec index 9afbd50..b58f209 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -10,7 +10,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -36,6 +36,7 @@ Patch14: wl-kmod-015_kernel_5.1_get_ds_removed.patch Patch15: wl-kmod-016_fix_unsupported_mesh_point.patch Patch16: wl-kmod-017_fix_gcc_fallthrough_warning.patch Patch17: wl-kmod-018_kernel_5.6_adaptations.patch +Patch18: wl-kmod-019_kernel_5.9_segment_eq_removed.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -94,6 +95,7 @@ pushd %{name}-%{version}-src %patch15 -p1 -b .fix_unsupported_mesh_point %patch16 -p1 -b .fix_gcc_fallthrough_warning.patch %patch17 -p1 -b .kernel_5.6_adaptations.patch +%patch18 -p1 -b .kernel_5.9_segment_eq_removed # Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec # Actually works for RHEL 6.x and 7.x @@ -283,6 +285,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 11 2020 Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; - 6.30.223.271-34 +- Add patch for kernel >= 5.9 - fixes RFBZ#5835 + * Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 6.30.223.271-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild