rpms/kernel/devel linux-2.6-bcm43xx-quiet.patch, NONE, 1.1 linux-2.6-bcm43xx-resume.patch, NONE, 1.1 kernel-2.6.spec, 1.1817, 1.1818

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2684

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-bcm43xx-quiet.patch linux-2.6-bcm43xx-resume.patch 
Log Message:
bcm43xx update

linux-2.6-bcm43xx-quiet.patch:
 bcm43xx_main.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE linux-2.6-bcm43xx-quiet.patch ---
--- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~	2006-01-03 22:56:55.000000000 +0000
+++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-01-03 22:57:24.000000000 +0000
@@ -4176,8 +4176,6 @@ int fastcall bcm43xx_rx(struct bcm43xx_p
 	case IEEE80211_FTYPE_DATA:
 		if (is_packet_for_us)
 			err = bcm43xx_rx_packet(bcm, skb, &stats);
-		else
-			dprintkl(KERN_ERR PFX "RX packet dropped (not for us)\n");
 		break;
 	case IEEE80211_FTYPE_CTL:
 		break;

linux-2.6-bcm43xx-resume.patch:
 bcm43xx_main.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-bcm43xx-resume.patch ---
--- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~	2006-01-03 22:56:55.000000000 +0000
+++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2006-01-03 23:00:15.000000000 +0000
@@ -4543,6 +4541,7 @@ static int bcm43xx_resume(struct pci_dev
 	}
 
 	netif_device_attach(net_dev);
+	queue_work(bcm->softmac->workqueue,&bcm->softmac->associnfo.work);
 
 	dprintk(KERN_INFO PFX "Device resumed.\n");
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1817
retrieving revision 1.1818
diff -u -r1.1817 -r1.1818
--- kernel-2.6.spec	3 Jan 2006 21:32:51 -0000	1.1817
+++ kernel-2.6.spec	3 Jan 2006 23:04:52 -0000	1.1818
@@ -381,9 +381,11 @@
 
 # Broadcom wireless driver
 Patch5000: linux-2.6-bcm43xx.patch
+Patch5001: linux-2.6-bcm43xx-quiet.patch
 Patch5002: linux-2.6-bcm43xx-promisc.patch
 Patch5003: linux-2.6.14-ieee80211-hw-wep.patch
 Patch5004: linux-2.6-bcm43xx-device-table.patch
+Patch5005: linux-2.6-bcm43xx-resume.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -900,12 +902,16 @@
 
 # Patch Kconfig and Makefiles to merge it 'properly'
 %patch5000 -p1
+# Make it shut up about dropping packets it didn't want
+%patch5001 -p1
 # Operate in promiscuous mode, to make multicast and broadcast RX work
 %patch5002 -p1
 # Handle host_build_iv properly
 %patch5003 -p1
 # Include pci device table so it gets autoloaded
 %patch5004 -p1
+# Reassociate on resume
+%patch5005 -p1
 
 #
 # final stuff
@@ -1394,6 +1400,10 @@
 %endif
 
 %changelog
+* Tue Jan  3 2006 David Woodhouse <dwmw2 at redhat.com>
+- Make bcm43xx quieter when dropping packets, and make it reassociate on 
+  resume
+
 * Tue Jan  3 2006 Dave Jones <davej at redhat.com>
 - Update to 2.6.15 final.
 - Altix: Fix sn_flush_device_kernel & spinlock initialization. (#176827)