drop queue-4.14/mips-make-sure-dt-memory-regions-are-valid.patch

[thirdparty/kernel/stable-queue.git] / releases / 2.6.20.2 / bcm43xx-fix-for-4309.patch

From stable-bounces@linux.kernel.org Sat Feb 17 09:45:44 2007
From: Stefano Brivio <stefano.brivio@polimi.it>
Date: Sat, 17 Feb 2007 18:43:14 +0100
Subject: bcm43xx: fix for 4309
To: stable@kernel.org
Cc: John Linville <linville@tuxdriver.com>, Stefano Brivio <stefano.brivio@polimi.it>, Larry Finger <larry.finger@lwfinger.net>
Message-ID: <200702171843.14872.mb@bu3sch.de>
Content-Disposition: inline

From: Stefano Brivio <stefano.brivio@polimi.it>

BCM4309 devices aren't working properly as A PHYs aren't supported yet, but
we probe 802.11a cores anyway. This fixes it, while still allowing for A PHY code
to be developed in the future.

Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
Cc: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/net/wireless/bcm43xx/bcm43xx_main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- linux-2.6.20.1.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ linux-2.6.20.1/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2736,8 +2736,9 @@ static int bcm43xx_probe_cores(struct bc
 				 * dangling pins on the second core. Be careful
 				 * and ignore these cores here.
 				 */
-				if (bcm->pci_dev->device != 0x4324) {
-					dprintk(KERN_INFO PFX "Ignoring additional 802.11 core.\n");
+				if (1 /*bcm->pci_dev->device != 0x4324*/ ) {
+				/* TODO: A PHY */
+					dprintk(KERN_INFO PFX "Ignoring additional 802.11a core.\n");
 					continue;
 				}
 			}