rpms/wl-kmod/devel wl-kmod-008_kernel_3.18.patch, NONE, 1.1 wl-kmod.spec, 1.87, 1.88
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24505
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-008_kernel_3.18.patch
Log Message:
* Mon Oct 27 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-4
- Added patch to build for kernel >= 3.18
wl-kmod-008_kernel_3.18.patch:
wl_cfg80211_hybrid.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE wl-kmod-008_kernel_3.18.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c
hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c
---
hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c 2014-09-10
19:27:13.301316000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c 2014-10-27
11:21:58.213536239 +0100
@@ -2025,9 +2025,17 @@
notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset);
notify_ielen = le32_to_cpu(bi->ie_length);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+ cbss = cfg80211_inform_bss(wiphy, channel,
+ (mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP :
CFG80211_BSS_FTYPE_BEACON,
+ (const u8 *)(bi->BSSID.octet),
+ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
+ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
+#else
cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet),
0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int,
(const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL);
+#endif
if (unlikely(!cbss))
return -ENOMEM;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- wl-kmod.spec 3 Oct 2014 20:52:52 -0000 1.87
+++ wl-kmod.spec 27 Oct 2014 10:34:55 -0000 1.88
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.248
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,6 +22,7 @@
Patch4: wl-kmod-005_gcc_4.9.patch
Patch5: wl-kmod-006_kernel_3.16.patch
Patch6: wl-kmod-007_kernel_3.17.patch
+Patch7: wl-kmod-008_kernel_3.18.patch
BuildRequires: %{_bindir}/kmodtool
@@ -67,6 +68,7 @@
%patch4 -p1 -b .gcc-4.9
%patch5 -p1 -b .kernel-3.16
%patch6 -p1 -b .kernel-3.17
+%patch7 -p1 -b .kernel-3.18
popd
for kernel_version in %{?kernel_versions} ; do
@@ -96,6 +98,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 27 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-4
+- Added patch to build for kernel >= 3.18
+
* Fri Oct 03 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.248-3
- Added patch to build for kernel >= 3.17