[packages/wl] - fix building with linux 4.7 - rel 2
baggins
baggins at pld-linux.org
Sun Jul 31 19:56:50 CEST 2016
commit 5bfd004b2d7612873a36ffc08675d31eedb859e4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jul 31 19:56:34 2016 +0200
- fix building with linux 4.7
- rel 2
linux-4.7.patch | 16 ++++++++++++++++
wl.spec | 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/wl.spec b/wl.spec
index 8c2195b..988c911 100644
--- a/wl.spec
+++ b/wl.spec
@@ -18,7 +18,7 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 1
+%define rel 2
%define pname wl
%define file_ver %(echo %{version} | tr . _)
Summary: Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
@@ -37,6 +37,7 @@ Source3: dkms.conf
Source4: modprobe.conf
Patch1: gcc-4.9.patch
Patch2: no-dead-code.patch
+Patch3: linux-4.7.patch
URL: http://www.broadcom.com/support/802.11/linux_sta.php
BuildRequires: rpmbuild(macros) >= 1.701
%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -119,6 +120,7 @@ EOF\
%setup -c -T -q -n %{pname}-%{version} -b%{src}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
mkdir wl
mv lib src Makefile wl/
diff --git a/linux-4.7.patch b/linux-4.7.patch
new file mode 100644
index 0000000..fb2bb6e
--- /dev/null
+++ b/linux-4.7.patch
@@ -0,0 +1,16 @@
+--- wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c~ 2015-09-19 00:47:30.000000000 +0200
++++ wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c 2016-07-31 19:54:31.535189248 +0200
+@@ -43,6 +43,13 @@
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+ #define EVENT_STATUS(e) dtoh32((e)->status)
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
++#define ieee80211_band nl80211_band
++#define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ
++#define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ
++#define IEEE80211_NUM_BANDS NUM_NL80211_BANDS
++#endif
++
+ #ifdef BCMDBG
+ u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
+ #else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wl.git/commitdiff/5bfd004b2d7612873a36ffc08675d31eedb859e4
More information about the pld-cvs-commit
mailing list