rpms/kernel/devel linux-2.6-bcm43xx-machine-check.patch, NONE, 1.1 kernel-2.6.spec, 1.2193, 1.2194

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri May 5 16:29:35 UTC 2006


Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-bcm43xx-machine-check.patch 
Log Message:
Fix bcm43xx

linux-2.6-bcm43xx-machine-check.patch:
 bcm43xx_phy.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-bcm43xx-machine-check.patch ---
--- linux-2.6.16.ppc64/drivers/net/wireless/bcm43xx/bcm43xx_phy.c~	2006-05-04 19:16:09.000000000 +0100
+++ linux-2.6.16.ppc64/drivers/net/wireless/bcm43xx/bcm43xx_phy.c	2006-05-05 17:22:57.000000000 +0100
@@ -1287,7 +1287,7 @@ static void bcm43xx_phy_initg(struct bcm
 	if (radio->revision == 8)
 		bcm43xx_phy_write(bcm, 0x0805, 0x3230);
 	bcm43xx_phy_init_pctl(bcm);
-	if (bcm->chip_id == 0x4306 && bcm->chip_package != 2) {
+	if (bcm->chip_id == 0x4306 && phy->rev >= 2) {
 		bcm43xx_phy_write(bcm, 0x0429,
 				  bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF);
 		bcm43xx_phy_write(bcm, 0x04C3,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2193
retrieving revision 1.2194
diff -u -r1.2193 -r1.2194
--- kernel-2.6.spec	5 May 2006 02:49:21 -0000	1.2193
+++ kernel-2.6.spec	5 May 2006 16:29:32 -0000	1.2194
@@ -389,6 +389,10 @@
 Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch
 Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch
 
+# Broadcom 43xx
+Patch2400: linux-2.6-bcm43xx-assoc-on-startup.patch
+Patch2401: linux-2.6-bcm43xx-machine-check.patch
+
 #
 # 10000 to 20000 is for stuff that has to come last due to the
 # amount of drivers they touch. But only these should go here.
@@ -1036,6 +1040,12 @@
 # acpi-ecdt-uid-hack
 %patch2301 -p1
 
+# Broadcom 43xx patches
+# Work around softmac lack of association on 'ifconfig up'
+%patch2400 -p1
+# Don't poke at PHY registers which don't exist
+%patch2401 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1713,6 +1723,10 @@
 
 %changelog
 * Fri May  5 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix #190776 by rediffing the patch so it actually gets applied properly
+- Fix the machine check too.
+
+* Fri May  5 2006 David Woodhouse <dwmw2 at redhat.com>
 - Remove bcm43xx-assoc-on-startup patch. I don't think the original 
   problem is fixed upstream yet, but this patch causes BZ #190776.
 




More information about the fedora-cvs-commits mailing list