rpms/wl-kmod/F-15 broadcom-wl-5.100.82.112-kernel-3.2.patch, NONE, 1.1 broadcom-wl-5.100.82.112-license.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 wl-kmod.spec, 1.73, 1.74 5_100_82_38.patch, 1.1, NONE broadcom-wl-5.100.82.38-license.patch, 1.1, NONE

[Nicolas Viéville]

Author: nvieville

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

Modified Files:
	.cvsignore sources wl-kmod.spec 
Added Files:
	broadcom-wl-5.100.82.112-kernel-3.2.patch 
	broadcom-wl-5.100.82.112-license.patch 
Removed Files:
	5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch 
Log Message:
* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
- 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)
+	.ndo_set_rx_mode = wl_set_multicast_list,
+#else
 	.ndo_set_multicast_list = wl_set_multicast_list,
+#endif
 	.ndo_do_ioctl = wl_ioctl
 };
 

broadcom-wl-5.100.82.112-license.patch:
 wl_linux.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE broadcom-wl-5.100.82.112-license.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-22 18:55:54.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c	2011-10-26 09:40:02.793032059 +0200
@@ -185,6 +185,8 @@
 static void wl_report_radio_state(wl_info_t *wl);
 #endif
 
+MODULE_LICENSE("MIXED/Proprietary");
+
 static struct pci_device_id wl_id_table[] = {
 	{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 
 	{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Nov 2011 00:42:42 -0000	1.10
+++ .cvsignore	11 Jan 2012 21:45:55 -0000	1.11
@@ -1,3 +1,3 @@
-hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
 broadcom-wl-kmodtool-excludekernel-filterfile


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	4 Nov 2011 00:42:47 -0000	1.10
+++ sources	11 Jan 2012 21:45:55 -0000	1.11
@@ -1,3 +1,3 @@
-cac172f7422fa43264049c7065fe21d6  hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
-c0074a1622c75916442e26763ddf47d0  hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+62d04d148b99f993ef575a71332593a9  hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+310d7ce233a9a352fbe62c451b2ea309  hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
 5df50b59ac8a311c81c9ad569ffc2225  broadcom-wl-kmodtool-excludekernel-filterfile


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- wl-kmod.spec	9 Jan 2012 12:55:27 -0000	1.73
+++ wl-kmod.spec	11 Jan 2012 21:45:55 -0000	1.74
@@ -3,22 +3,22 @@
 # "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.38
-Release:	1%{?dist}.9
+Version:	5.100.82.112
+Release:	1%{?dist}
 Summary:	Kernel module for Broadcom wireless devices
 Group:		System Environment/Kernel
 License:	Redistributable, no modification permitted
 URL:		http://www.broadcom.com/support/802.11/linux_sta.php
-Source0:	http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
-Source1:	http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
+Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+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.38-license.patch
-Patch1:		http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5_100_82_38.patch
+Patch0:		broadcom-wl-5.100.82.112-license.patch
+Patch1:		broadcom-wl-5.100.82.112-kernel-3.2.patch
 
 BuildRequires:	%{_bindir}/kmodtool
 
@@ -55,7 +55,7 @@
  tar xzf %{SOURCE1}
 %endif
 %patch0 -p1 -b .license
-%patch1 -p0 -b .init_MUTEX
+%patch1 -p1 -b .kernel-3.2
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +85,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 11 2012 Nicolas Vieville <nicolas.vieville at univ-valenciennes.fr> - 5.100.82.112-1
+- Updated version to 5.100.82.112
+- 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.38-1.9
 - rebuild for updated kernel
 


--- 5_100_82_38.patch DELETED ---


--- broadcom-wl-5.100.82.38-license.patch DELETED ---