diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-09-20 07:36:55 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-09-20 07:36:55 +0000 |
| commit | f14c008adb5b4dd7d7c332690f2861158ffcac2a (patch) | |
| tree | 98819369750ab2a3da2c91754300007baa0f2fad /target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch | |
| parent | 3399aaf35ee37df541d40aeb3a360e82341de44f (diff) | |
patch from ticket #787
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4803 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch')
| -rw-r--r-- | target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch b/target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch new file mode 100644 index 0000000000..51206296bc --- /dev/null +++ b/target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch @@ -0,0 +1,42 @@ +--- linux-2.6.17.orig/drivers/net/b44.h 2006-09-19 19:56:03.000000000 +0200 ++++ linux-2.6.17/drivers/net/b44.h 2006-09-19 19:58:01.000000000 +0200 +@@ -122,6 +122,7 @@ + #define RXCONFIG_FLOW 0x00000020 /* Flow Control Enable */ + #define RXCONFIG_FLOW_ACCEPT 0x00000040 /* Accept Unicast Flow Control Frame */ + #define RXCONFIG_RFILT 0x00000080 /* Reject Filter */ ++#define RXCONFIG_CAM_ABSENT 0x00000100 /* CAM Absent */ + #define B44_RXMAXLEN 0x0404UL /* EMAC RX Max Packet Length */ + #define B44_TXMAXLEN 0x0408UL /* EMAC TX Max Packet Length */ + #define B44_MDIO_CTRL 0x0410UL /* EMAC MDIO Control */ +--- linux-2.6.17.orig/drivers/net/b44.c 2006-09-19 19:56:03.000000000 +0200 ++++ linux-2.6.17/drivers/net/b44.c 2006-09-19 20:08:22.000000000 +0200 +@@ -1435,6 +1435,7 @@ + { + struct b44 *bp = netdev_priv(dev); + struct sockaddr *addr = p; ++ u32 val; + + if (netif_running(dev)) + return -EBUSY; +@@ -1445,7 +1446,11 @@ + memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); + + spin_lock_irq(&bp->lock); +- __b44_set_mac_addr(bp); ++ ++ val = br32(bp, B44_RXCONFIG); ++ if (!(val & RXCONFIG_CAM_ABSENT)) ++ __b44_set_mac_addr(bp); ++ + spin_unlock_irq(&bp->lock); + + return 0; +@@ -1641,7 +1646,7 @@ + + val = br32(bp, B44_RXCONFIG); + val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI); +- if (dev->flags & IFF_PROMISC) { ++ if ((dev->flags & IFF_PROMISC) || (val & RXCONFIG_CAM_ABSENT)) { + val |= RXCONFIG_PROMISC; + bw32(bp, B44_RXCONFIG, val); + } else { |