rpms/wl-kmod/F-10 broadcom-wl-5.10.79.10-linux-2.6.29.patch, 1.1, 1.2 wl-kmod.spec, 1.21, 1.22

[Chris Nolan]

Author: cnolan

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

Modified Files:
	broadcom-wl-5.10.79.10-linux-2.6.29.patch wl-kmod.spec 
Log Message:
* Sat Mar 28 2009 Chris Nolan <chris at cenolan.com> - 5.10.79.10-2
- repatched to load lib80211_crypt_tkip module - bug #466


broadcom-wl-5.10.79.10-linux-2.6.29.patch:

Index: broadcom-wl-5.10.79.10-linux-2.6.29.patch
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/broadcom-wl-5.10.79.10-linux-2.6.29.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-5.10.79.10-linux-2.6.29.patch	8 Mar 2009 21:12:03 -0000	1.1
+++ broadcom-wl-5.10.79.10-linux-2.6.29.patch	28 Mar 2009 19:59:46 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u -r 5.10.79.10.orig/src/wl/sys/wl_iw.c 5.10.79.10/src/wl/sys/wl_iw.c
---- 5.10.79.10.orig/src/wl/sys/wl_iw.c	2009-03-08 20:19:07.000000000 +0000
-+++ 5.10.79.10/src/wl/sys/wl_iw.c	2009-03-08 20:19:23.000000000 +0000
+diff -u -r hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_iw.c hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_iw.c
+--- hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_iw.c	2009-02-09 21:43:18.000000000 +0000
++++ hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_iw.c	2009-03-28 17:51:03.000000000 +0000
 @@ -610,7 +610,11 @@
  	char *extra
  )
@@ -73,9 +73,9 @@
  
  	WL_TRACE(("%s: SIOCGIWAUTH\n", dev->name));
  
-diff -u -r 5.10.79.10.orig/src/wl/sys/wl_linux.c 5.10.79.10/src/wl/sys/wl_linux.c
---- 5.10.79.10.orig/src/wl/sys/wl_linux.c	2009-03-08 20:19:07.000000000 +0000
-+++ 5.10.79.10/src/wl/sys/wl_linux.c	2009-03-08 20:19:23.000000000 +0000
+diff -u -r hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_linux.c hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_linux.c
+--- hybrid-portsrc-x86_32-v5_10_79_10.orig/src/wl/sys/wl_linux.c	2009-02-09 21:43:32.000000000 +0000
++++ hybrid-portsrc-x86_32-v5_10_79_10/src/wl/sys/wl_linux.c	2009-03-28 18:08:39.000000000 +0000
 @@ -53,6 +53,9 @@
  #include <linux/pci_ids.h>
  #define WLC_MAXBSSCFG		1	
@@ -120,7 +120,7 @@
  
  	dev->base_addr = regs;
  
-@@ -436,10 +450,19 @@
+@@ -436,10 +450,20 @@
  
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
  
@@ -132,6 +132,7 @@
  	if (wl->tkipmodops == NULL) {
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 +		request_module("lib80211");
++		request_module("lib80211_crypt_tkip");
 +		wl->tkipmodops = lib80211_get_crypto_ops("TKIP");
 +#else
  		request_module("ieee80211_crypt_tkip");
@@ -140,7 +141,7 @@
  	}
  #endif 
  #ifdef CONFIG_WIRELESS_EXT
-@@ -744,7 +767,11 @@
+@@ -744,7 +768,11 @@
  	}
  
  	if (wl->monitor) {
@@ -152,7 +153,7 @@
  		wl->monitor = NULL;
  	}
  
-@@ -913,6 +940,9 @@
+@@ -913,6 +941,9 @@
  #else
  
  	dev = alloc_netdev(0, name, ether_setup);
@@ -162,7 +163,7 @@
  	if (!dev) {
  		MFREE(wl->osh, wlif, sizeof(wl_if_t));
  		WL_ERROR(("wl%d: wl_alloc_if: out of memory, alloc_netdev\n",
-@@ -926,7 +956,9 @@
+@@ -926,7 +957,9 @@
  	wlif->wl = wl;
  	wlif->wlcif = wlcif;
  	wlif->subunit = subunit;


Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/wl-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wl-kmod.spec	25 Mar 2009 14:33:49 -0000	1.21
+++ wl-kmod.spec	28 Mar 2009 19:59:46 -0000	1.22
@@ -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
-%define buildforkernels newest
+#define buildforkernels newest
 
 Name:		wl-kmod
 Version:	5.10.79.10
-Release:	1%{?dist}.1
+Release:	2%{?dist}
 Summary:	Kernel module for broadcom wireless devices
 Group:		System Environment/Kernel
 License:	Redistributable, no modification permitted
@@ -82,6 +82,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Mar 28 2009 Chris Nolan <chris at cenolan.com> - 5.10.79.10-2
+- repatched to load lib80211_crypt_tkip module - bug #466
+
 * Wed Mar 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-1.1
 - rebuild for new kernels