rpms/wl-kmod/F-20 wl-kmod-006_kernel_3.17.patch, NONE, 1.1 wl-kmod.spec, 1.126, 1.127
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3056
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-006_kernel_3.17.patch
Log Message:
* 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
wl-kmod-006_kernel_3.17.patch:
wl_linux.c | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE wl-kmod-006_kernel_3.17.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c
hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_linux.c 2014-07-15
17:27:12.550312000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_linux.c 2014-10-03
22:02:07.746840461 +0200
@@ -1313,7 +1313,12 @@
dev->priv = priv_link;
#else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup);
+#else
+ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN,
+ ether_setup);
+#endif
if (!dev) {
WL_ERROR(("wl%d: %s: alloc_netdev failed\n",
(wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__));
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- wl-kmod.spec 19 Sep 2014 11:06:41 -0000 1.126
+++ wl-kmod.spec 3 Oct 2014 20:56:27 -0000 1.127
@@ -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 newest
+%global buildforkernels current
Name: wl-kmod
Version: 6.30.223.248
-Release: 2%{?dist}.2
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@
Patch2: wl-kmod-003_kernel_3.8.patch
Patch3: wl-kmod-004_kernel_3.15.patch
Patch4: wl-kmod-005_kernel_3.16.patch
+Patch5: wl-kmod-006_kernel_3.17.patch
BuildRequires: %{_bindir}/kmodtool
@@ -63,6 +64,7 @@
%patch2 -p1 -b .kernel-3.8
%patch3 -p1 -b .kernel-3.15
%patch4 -p1 -b .kernel-3.16
+%patch5 -p1 -b .kernel-3.17
popd
for kernel_version in %{?kernel_versions} ; do
@@ -92,6 +94,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* 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
+
* Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-2.2
- Rebuilt for kernel