bcm43xx: fix for 4309

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>

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index bbe0e0d257cc5b07260a65c1ebfc43bb2cf5c4ea..2f9d0e05eb9b92ae591c5f12580b7e7660bfaf12 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2736,8 +2736,9 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm)
                                 * 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;
                                }
                        }