update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom...

[openwrt/svn-archive/archive.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 1deffc54a3c3661c7bf6f18312ddce6bb8a87186..5023e181c4a5832a22b8a97145b8960420816eb4 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,5 +1,7 @@
---- 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
+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
 @@ -122,6 +122,7 @@
  #define  RXCONFIG_FLOW                0x00000020 /* Flow Control Enable */
  #define  RXCONFIG_FLOW_ACCEPT 0x00000040 /* Accept Unicast Flow Control Frame */
@@ -8,8 +10,10 @@
  #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
+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 @@
  {
        struct b44 *bp = dev->priv;
@@ -31,7 +35,7 @@
        spin_unlock_irq(&bp->lock);
  
        return 0;
-@@ -1488,7 +1493,7 @@
+@@ -1495,7 +1500,7 @@
  
        val = br32(B44_RXCONFIG);
        val &= ~(RXCONFIG_PROMISC | RXCONFIG_ALLMULTI);