[backfire] ar71xx: merge r28597

[openwrt-10.03/.git] / target / linux / brcm-2.4 / patches / 010-bcm47xx-cam_absent.patch

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
index 5023e181c4a5832a22b8a97145b8960420816eb4..18799cbc76df55c4f700aaf656c5f9e750641698 100644 (file)
--- a/target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch
+++ b/target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch
@@ -1,7 +1,5 @@
-Index: linux-2.4.35.4/drivers/net/b44.h
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/b44.h      2007-12-15 05:20:16.028753670 +0100
-+++ linux-2.4.35.4/drivers/net/b44.h   2007-12-15 05:20:16.480779429 +0100
+--- a/drivers/net/b44.h
++++ b/drivers/net/b44.h
 @@ -122,6 +122,7 @@
  #define  RXCONFIG_FLOW                0x00000020 /* Flow Control Enable */
  #define  RXCONFIG_FLOW_ACCEPT 0x00000040 /* Accept Unicast Flow Control Frame */
@@ -10,11 +8,9 @@ Index: linux-2.4.35.4/drivers/net/b44.h
  #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 */
-Index: linux-2.4.35.4/drivers/net/b44.c
-===================================================================
---- linux-2.4.35.4.orig/drivers/net/b44.c      2007-12-15 05:20:16.020753214 +0100
-+++ linux-2.4.35.4/drivers/net/b44.c   2007-12-15 05:20:16.480779429 +0100
-@@ -1301,6 +1301,7 @@
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
+@@ -1299,6 +1299,7 @@ static int b44_set_mac_addr(struct net_d
  {
        struct b44 *bp = dev->priv;
        struct sockaddr *addr = p;
@@ -22,7 +18,7 @@ Index: linux-2.4.35.4/drivers/net/b44.c
  
        if (netif_running(dev))
                return -EBUSY;
-@@ -1308,7 +1309,11 @@
+@@ -1306,7 +1307,11 @@ static int b44_set_mac_addr(struct net_d
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
  
        spin_lock_irq(&bp->lock);
@@ -35,7 +31,7 @@ Index: linux-2.4.35.4/drivers/net/b44.c
        spin_unlock_irq(&bp->lock);
  
        return 0;
-@@ -1495,7 +1500,7 @@
+@@ -1493,7 +1498,7 @@ static void __b44_set_rx_mode(struct net
  
        val = br32(B44_RXCONFIG);
        val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);