rpms/wl-kmod/F-16 broadcom-wl-5.100.82.112-kernel-3.2.patch, NONE, 1.1 wl-kmod.spec, 1.66, 1.67

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/wl-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18103

Modified Files:
	wl-kmod.spec 
Added Files:
	broadcom-wl-5.100.82.112-kernel-3.2.patch 
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-2
- Added patch to build for kernel >= 3.2 or (>= 2.6.42 and < 3.0.0)


broadcom-wl-5.100.82.112-kernel-3.2.patch:
 wl_linux.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE broadcom-wl-5.100.82.112-kernel-3.2.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c	2011-10-26 09:40:02.793032059 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c	2012-01-09 15:07:19.641120013 +0100
@@ -387,7 +387,11 @@
 #endif
 	.ndo_get_stats = wl_get_stats,
 	.ndo_set_mac_address = wl_set_mac_address,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 42) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0))
+	.ndo_set_rx_mode = wl_set_multicast_list,
+#else
 	.ndo_set_multicast_list = wl_set_multicast_list,
+#endif
 	.ndo_do_ioctl = wl_ioctl
 };
 


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-16/wl-kmod.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- wl-kmod.spec	9 Jan 2012 12:44:52 -0000	1.66
+++ wl-kmod.spec	11 Jan 2012 22:15:05 -0000	1.67
@@ -3,13 +3,13 @@
 # "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
-%define buildforkernels newest
-%define buildforkernels newest
-%define buildforkernels newest
+#define buildforkernels newest
+%define buildforkernels current
+#define buildforkernels akmods
 
 Name:		wl-kmod
 Version:	5.100.82.112
-Release:	1%{?dist}.10
+Release:	2%{?dist}
 Summary:	Kernel module for Broadcom wireless devices
 Group:		System Environment/Kernel
 License:	Redistributable, no modification permitted
@@ -18,6 +18,7 @@
 Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
 Source11:	broadcom-wl-kmodtool-excludekernel-filterfile
 Patch0:		broadcom-wl-5.100.82.112-license.patch
+Patch1:		broadcom-wl-5.100.82.112-kernel-3.2.patch
 
 BuildRequires:	%{_bindir}/kmodtool
 
@@ -54,6 +55,7 @@
  tar xzf %{SOURCE1}
 %endif
 %patch0 -p1 -b .license
+%patch1 -p1 -b .kernel-3.2
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +85,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-2
+- Added patch to build for kernel >= 3.2 or (>= 2.6.42 and < 3.0.0)
+
 * Mon Jan 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 5.100.82.112-1.10
 - rebuild for updated kernel