[wl-kmod: 1/2] Add patch for kernel >= 5.1.x - get_ds function removed

commit 4107111d76a9466e80abd7217679c113c84441fe Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; Date: Wed Apr 17 10:27:38 2019 +0200 Add patch for kernel >= 5.1.x - get_ds function removed wl-kmod-015_kernel_5.1_get_ds_removed.patch | 15 +++++++++++++++ wl-kmod.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) --- diff --git a/wl-kmod-015_kernel_5.1_get_ds_removed.patch b/wl-kmod-015_kernel_5.1_get_ds_removed.patch new file mode 100644 index 0000000..39c6888 --- /dev/null +++ b/wl-kmod-015_kernel_5.1_get_ds_removed.patch @@ -0,0 +1,15 @@ +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-07-03 11:32:04.271398000 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2019-04-14 17:35:23.565460847 +0200 +@@ -490,7 +490,11 @@ + ifr.ifr_data = (caddr_t)&ioc; + + fs = get_fs(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) ++ set_fs(KERNEL_DS); ++#else + set_fs(get_ds()); ++#endif + #if defined(WL_USE_NETDEV_OPS) + err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + #else diff --git a/wl-kmod.spec b/wl-kmod.spec index e7ac78d..b489d5d 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -8,7 +8,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -30,6 +30,7 @@ Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch Patch11: wl-kmod-012_kernel_4.15_new_timer.patch Patch12: wl-kmod-013_gcc8_fix_bounds_check_warnings.patch Patch13: wl-kmod-014_kernel_read_pos_increment_fix.patch +Patch14: wl-kmod-015_kernel_5.1_get_ds_removed.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -84,6 +85,7 @@ pushd %{name}-%{version}-src %patch11 -p1 -b .kernel_4.15_new_timer %patch12 -p1 -b .gcc8_fix_bounds_check_warnings %patch13 -p1 -b .kernel_read_pos_increment_fix +%patch14 -p1 -b .kernel_5.1_get_ds_removed # Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec # Actually works for RHEL 6.x and 7.x @@ -253,6 +255,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 14 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; - 6.30.223.271-24 +- Add patch for kernel >= 5.1.x - get_ds function removed + * Sat Apr 06 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr&gt; - 6.30.223.271-23 - Rework SPEC file in order to build for RHEL 6.x and 7.x - Rebuilt for akmods-ostree-post scriptlet