Upgrade to Linux 2.6.19

[openwrt/staging/mkresin.git] / target / linux / brcm-2.6 / patches / 010-bcm47xx-cam_absent.patch

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
index 51206296bc28fe509a0dd7d7530517bd8613a3bb..2a9282aa0b2dafc13b4e0996caff6840a64819ad 100644 (file)
--- a/target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch
+++ b/target/linux/brcm-2.6/patches/010-bcm47xx-cam_absent.patch
@@ -1,16 +1,7 @@
---- 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 @@
+diff -urN linux-2.6.19.ref/drivers/net/b44.c linux-2.6.19/drivers/net/b44.c
+--- linux-2.6.19.ref/drivers/net/b44.c 2006-12-04 21:34:14.000000000 +0100
++++ linux-2.6.19/drivers/net/b44.c     2006-12-04 21:34:19.000000000 +0100
+@@ -1445,6 +1445,7 @@
  {
        struct b44 *bp = netdev_priv(dev);
        struct sockaddr *addr = p;
@@ -18,20 +9,20 @@
  
        if (netif_running(dev))
                return -EBUSY;
-@@ -1445,7 +1446,11 @@
+@@ -1455,7 +1456,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 @@
+@@ -1797,7 +1802,7 @@
  
        val = br32(bp, B44_RXCONFIG);
        val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);
@@ -40,3 +31,14 @@
                val |= RXCONFIG_PROMISC;
                bw32(bp, B44_RXCONFIG, val);
        } else {
+diff -urN linux-2.6.19.ref/drivers/net/b44.h linux-2.6.19/drivers/net/b44.h
+--- linux-2.6.19.ref/drivers/net/b44.h 2006-12-04 21:34:14.000000000 +0100
++++ linux-2.6.19/drivers/net/b44.h     2006-12-04 21:34:19.000000000 +0100
+@@ -129,6 +129,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 */