rpms/kernel/devel kernel-2.6.spec,1.2087,1.2088

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix bcm43xx lockup (#180953)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2087
retrieving revision 1.2088
diff -u -r1.2087 -r1.2088
--- kernel-2.6.spec	23 Mar 2006 21:21:22 -0000	1.2087
+++ kernel-2.6.spec	24 Mar 2006 11:08:52 -0000	1.2088
@@ -406,6 +406,7 @@
 Patch5004: linux-2.6-softmac-scan-dwell-time.patch
 Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch
 Patch5006: linux-2.6-softmac-default-rate.patch
+Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -1044,6 +1045,9 @@
 %patch5005 -p1
 # Default to 11Mbps not 54Mbps, since we don't back down automatically yet.
 %patch5006 -p1
+# bcm43xx dies if we attempt to set the channel while it's down.
+%patch5007 -p1
+
 #
 # final stuff
 #
@@ -1645,6 +1649,10 @@
 %endif
 
 %changelog
+* Fri Mar 24 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix lockup when someone takes the bcm43xx device down while it's
+  scanning (#180953)
+
 * Thu Mar 23 2006 Juan Quintela <quintela at redhat.com>
 - disable sky2 (as it is broken upstream)
 
@@ -1660,6 +1668,7 @@
 * Wed Mar 22 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update the bcm43xx driver to make it work nicely with initscripts
   and NetworkManager without user intervention.
+- Fix Tux build
 
 * Tue Mar 21 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-git3