Author: cnolan Update of /cvs/nonfree/rpms/wl-kmod/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19345 Modified Files: .cvsignore sources wl-kmod.spec Added Files: broadcom-wl-5.10.91.9.3-license.patch broadcom-wl-5.10.91.9.3-linux-2.6.32.patch Removed Files: broadcom-wl-5.10.91.9-license.patch broadcom-wl-5.10.91.9-linux-2.6.29.patch broadcom-wl-5.10.91.9-linux-2.6.30.patch Log Message: * Tue Feb 09 2010 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3-1 - Updated version to 5.10.91.9.3 - Added patch for 2.6.32 kernel broadcom-wl-5.10.91.9.3-license.patch: wl_linux.c | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE broadcom-wl-5.10.91.9.3-license.patch --- diff -Naur hybrid-portsrc-x86_32-v5.10.91.9.3.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c --- hybrid-portsrc-x86_32-v5.10.91.9.3.orig/src/wl/sys/wl_linux.c 2009-09-10 19:21:58.000000000 +0100 +++ hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c 2009-09-19 14:10:00.470676797 +0100 @@ -171,6 +171,8 @@ static void my_force_kill(wl_task_t *task); #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 }, broadcom-wl-5.10.91.9.3-linux-2.6.32.patch: wl_linux.c | 3 +++ 1 file changed, 3 insertions(+) --- NEW FILE broadcom-wl-5.10.91.9.3-linux-2.6.32.patch --- diff -rup hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c --- hybrid-portsrc-x86_32-v5.10.91.9.3/src/wl/sys/wl_linux.c 2009-09-10 20:21:58.000000000 +0200 +++ hybrid-portsrc-x86_32-v5.10.91.9.3_EDIT/src/wl/sys/wl_linux.c 2009-12-07 12:51:20.000000000 +0100 @@ -40,6 +40,9 @@ #include <linux/pci_ids.h> #define WLC_MAXBSSCFG 1 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32) +#include <linux/sched.h> +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) #include <net/lib80211.h> #endif Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 13 Jun 2009 10:08:52 -0000 1.7 +++ .cvsignore 9 Feb 2010 22:38:50 -0000 1.8 @@ -1,2 +1,2 @@ -hybrid-portsrc-x86_32-v5_10_91_9.tar.gz -hybrid-portsrc-x86_64-v5_10_91_9.tar.gz +hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz +hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 13 Jun 2009 10:08:52 -0000 1.7 +++ sources 9 Feb 2010 22:38:50 -0000 1.8 @@ -1,2 +1,2 @@ -8c538fedcc48df17668bd2b4ee424549 hybrid-portsrc-x86_32-v5_10_91_9.tar.gz -39ad099c6d2b1617bbad37f7f44e57bc hybrid-portsrc-x86_64-v5_10_91_9.tar.gz +15890e1f9afe844adf2e251d390e28ac hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz +ed255d2c98690ef76757d95b2d9e6b32 hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/wl-kmod.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- wl-kmod.spec 8 Feb 2010 07:26:40 -0000 1.60 +++ wl-kmod.spec 9 Feb 2010 22:38:50 -0000 1.61 @@ -3,21 +3,20 @@ # "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 Name: wl-kmod -Version: 5.10.91.9 -Release: 4%{?dist}.11 +Version: 5.10.91.9.3 +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://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5_10_91_9.t... -Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5_10_91_9.t... +Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.10.91.9.3... +Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.10.91.9.3... Source11: broadcom-wl-kmodtool-excludekernel-filterfile -Patch0: broadcom-wl-5.10.91.9-linux-2.6.29.patch -Patch1: broadcom-wl-5.10.91.9-license.patch -Patch2: broadcom-wl-5.10.91.9-linux-2.6.30.patch +Patch0: broadcom-wl-5.10.91.9.3-license.patch +Patch1: broadcom-wl-5.10.91.9.3-linux-2.6.32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -54,9 +53,8 @@ %else tar xzf %{SOURCE1} %endif -%patch0 -p1 -b .kernelfix -%patch1 -p1 -b .license -%patch2 -p1 -b .kernel30fix +%patch0 -p1 -b .license +%patch1 -p1 -b .kernelfix popd for kernel_version in %{?kernel_versions} ; do @@ -86,6 +84,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 09 2010 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3-1 +- Updated version to 5.10.91.9.3 +- Added patch for 2.6.32 kernel + * Mon Feb 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9-4.11 - rebuild for new kernel --- broadcom-wl-5.10.91.9-license.patch DELETED --- --- broadcom-wl-5.10.91.9-linux-2.6.29.patch DELETED --- --- broadcom-wl-5.10.91.9-linux-2.6.30.patch DELETED ---