From 263b171ff3ee40011bda9f694c1efa9f00b0d4dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 7 May 2019 19:21:04 +0200 Subject: [PATCH] - fix building with kernel 5.1 - rel 9 --- linux-5.1.patch | 14 ++++++++++++++ wl.spec | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 linux-5.1.patch diff --git a/linux-5.1.patch b/linux-5.1.patch new file mode 100644 index 0000000..0e5436c --- /dev/null +++ b/linux-5.1.patch @@ -0,0 +1,14 @@ +--- wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c~ 2019-05-07 19:17:44.000000000 +0200 ++++ wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c 2019-05-07 19:19:00.311600063 +0200 +@@ -464,7 +464,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.spec b/wl.spec index dd2dc74..80add87 100644 --- a/wl.spec +++ b/wl.spec @@ -18,7 +18,7 @@ exit 1 %define _duplicate_files_terminate_build 0 -%define rel 8 +%define rel 9 %define pname wl %define file_ver %(echo %{version} | tr . _) Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver @@ -44,6 +44,7 @@ Patch5: 17-fix-kernel-warnings.patch Patch6: linux-4.11.patch Patch7: linux-4.12.patch Patch8: 008-linux415.patch +Patch9: linux-5.1.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}} @@ -133,6 +134,7 @@ EOF\ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 mkdir wl mv lib src Makefile wl/ -- 2.43.0