Hi John,

Please apply this to wireless-dev.

Larry, theoretically it's possible to backport this
to wireless-2.6. But it depends on some other changes
that are (going to be) in the ssb module. That's support
for PCIE and CHIPCOMMON2, as far as I can see.
So if you want to backport this, you also have to backport
the PCIE and CHIPCOMMON2 stuff.

--

Add support for Broadcom 4312 a/b/g devices.

Signed-off-by: Michael Buesch <[EMAIL PROTECTED]>

Index: wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-dev.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c        
2006-08-24 22:49:45.000000000 +0200
+++ wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c     
2006-08-26 12:39:24.000000000 +0200
@@ -129,6 +129,8 @@ static struct pci_device_id bcm43xx_pci_
        { PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        /* Broadcom 4307 802.11b */
        { PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       /* Broadcom 4312 802.11a/b/g */
+       { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        /* Broadcom 4318 802.11b/g */
        { PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        /* Broadcom 4319 802.11b/g */
@@ -2742,7 +2744,7 @@ static int bcm43xx_probe_cores(struct bc
 
                        switch (core->rev) {
                        case 2: case 4: case 5: case 6:
-                       case 7: case 9:
+                       case 7: case 9: case 10:
                                break;
                        default:
                                printk(KERN_ERR PFX "Error: Unsupported 80211 
core revision %u\n",
@@ -3247,7 +3249,7 @@ static int bcm43xx_read_phyinfo(struct b
                        phy_rev_ok = 0;
                break;
        case BCM43xx_PHYTYPE_G:
-               if (phy_rev > 7)
+               if (phy_rev > 8)
                        phy_rev_ok = 0;
                break;
        default:


-- 
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to