diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-01-06 19:28:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-06 19:28:07 +0000 |
commit | 19887d557e01aad2145fa3ad086bc12a8d04695a (patch) | |
tree | 58af9e3b3204308a2b7853127331f4d693e1b744 /target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch | |
parent | 666f303b8f8a76ca44b62a58ae270d520944897b (diff) | |
download | upstream-19887d557e01aad2145fa3ad086bc12a8d04695a.tar.gz upstream-19887d557e01aad2145fa3ad086bc12a8d04695a.tar.bz2 upstream-19887d557e01aad2145fa3ad086bc12a8d04695a.zip |
update brcm-2.4 to 2.4.35.4, integrate new broadcom system code, update broadcom-wl to a contributed version (v4.150.10.5) - no bcm57xx support yet, will follow shortly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch')
-rw-r--r-- | target/linux/brcm-2.4/patches/010-bcm47xx-cam_absent.patch | 14 |
1 files changed, 9 insertions, 5 deletions
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 1deffc54a3..5023e181c4 100644 --- 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); |