rpms/wl-kmod/F-11 broadcom-wl-5.10.91.9-linux-2.6.30.patch, NONE, 1.1 wl-kmod.spec, 1.48, 1.49

[Chris Nolan]

Author: cnolan

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

Modified Files:
	wl-kmod.spec 
Added Files:
	broadcom-wl-5.10.91.9-linux-2.6.30.patch 
Log Message:
* Mon Sep 07 2009 Chris Nolan <chris at cenolan.com> - 5.10.91-4
- added patch for 2.6.30 kernels


broadcom-wl-5.10.91.9-linux-2.6.30.patch:

--- NEW FILE broadcom-wl-5.10.91.9-linux-2.6.30.patch ---
--- src/wl/sys/wl_linux.c.orig	2009-04-23 21:16:26.637443671 +0400
+++ src/wl/sys/wl_linux.c	2009-04-23 21:17:58.842687327 +0400
@@ -56,9 +56,13 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 #include <net/lib80211.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+#include <linux/ieee80211.h>
+#else
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
 #include <net/ieee80211.h>
 #endif
+#endif
 
 #include <asm/system.h>
 #include <asm/io.h>


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-11/wl-kmod.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wl-kmod.spec	1 Sep 2009 05:23:11 -0000	1.48
+++ wl-kmod.spec	7 Sep 2009 21:22:24 -0000	1.49
@@ -7,7 +7,7 @@
 
 Name:		wl-kmod
 Version:	5.10.91.9
-Release:	3%{?dist}.9
+Release:	4%{?dist}
 Summary:	Kernel module for broadcom wireless devices
 Group:		System Environment/Kernel
 License:	Redistributable, no modification permitted
@@ -17,6 +17,7 @@
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	%{_bindir}/kmodtool
@@ -55,6 +56,7 @@
 %endif
 %patch0 -p1 -b .kernelfix
 %patch1 -p1 -b .license
+%patch2 -p1 -b .kernel30fix
 popd
 
 for kernel_version in %{?kernel_versions} ; do
@@ -84,6 +86,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Sep 07 2009 Chris Nolan <chris at cenolan.com> - 5.10.91-4
+- added patch for 2.6.30 kernels
+
 * Tue Sep 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9-3.9
 - rebuild for new kernels