patch from ticket #787

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4803 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch b/target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch
new file mode 100644 (file)
index 0000000..1deffc5
--- /dev/null
+++ b/target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch
@@ -0,0 +1,42 @@
+--- linux-2.4.32.orig/drivers/net/b44.h        2006-09-19 19:56:03.000000000 +0200
++++ linux-2.4.32/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.4.32.orig/drivers/net/b44.c        2006-09-19 19:56:03.000000000 +0200
++++ linux-2.4.32/drivers/net/b44.c     2006-09-19 20:08:22.000000000 +0200
+@@ -1301,6 +1301,7 @@
+ {
+       struct b44 *bp = dev->priv;
+       struct sockaddr *addr = p;
++      u32 val;
+ 
+       if (netif_running(dev))
+               return -EBUSY;
+@@ -1308,7 +1309,11 @@
+       memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+ 
+       spin_lock_irq(&bp->lock);
+-      __b44_set_mac_addr(bp);
++   
++      val = br32(B44_RXCONFIG);
++      if (!(val & RXCONFIG_CAM_ABSENT))
++              __b44_set_mac_addr(bp);
++   
+       spin_unlock_irq(&bp->lock);
+ 
+       return 0;
+@@ -1488,7 +1493,7 @@
+ 
+       val = br32(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(B44_RXCONFIG, val);
+       } else {

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 (file)
index 0000000..5120629
--- /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 {