rpms/wl-kmod/devel wl-kmod-005_kernel_3.15.patch, NONE, 1.1 wl-kmod.spec, 1.80, 1.81
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30728
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-005_kernel_3.15.patch
Log Message:
* Tue Apr 22 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-2
- Added patch to build for kernel >= 3.15
wl-kmod-005_kernel_3.15.patch:
wl_cfg80211_hybrid.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-005_kernel_3.15.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c
hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c
---
hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_cfg80211_hybrid.c 2013-08-01
08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_cfg80211_hybrid.c 2014-04-22
17:41:44.507896038 +0200
@@ -1841,7 +1841,11 @@
wl_get_assoc_ies(wl);
memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
wl_update_bss_info(wl);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
+ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, &wl->conf->channel,
GFP_KERNEL);
+#else
cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
+#endif
set_bit(WL_STATUS_CONNECTED, &wl->status);
wl->profile->active = true;
}
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- wl-kmod.spec 10 Dec 2013 19:24:04 -0000 1.80
+++ wl-kmod.spec 22 Apr 2014 16:58:46 -0000 1.81
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels current
+%global buildforkernels akmod
Name: wl-kmod
Version: 6.30.223.141
-Release: 5%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@
Patch1: wl-kmod-002_wext_workaround.patch
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.10.patch
+Patch4: wl-kmod-005_kernel_3.15.patch
BuildRequires: %{_bindir}/kmodtool
@@ -61,6 +62,7 @@
%patch1 -p1 -b .wext_workaround.patch
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.10
+%patch4 -p1 -b .kernel-3.15
popd
for kernel_version in %{?kernel_versions} ; do
@@ -90,6 +92,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Apr 22 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> -
6.30.223.141-2
+- Added patch to build for kernel >= 3.15
+
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5
- Rebuilt for f20 final kernel