diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-21 15:50:56 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-21 15:50:56 +0000 |
| commit | 66f1d0c29bc2bcf9ae98b7c7287573fd816d3e4b (patch) | |
| tree | b9fad8f0f6e88dcd9c9bef412cb62b3d5ef0aeec /target/linux/linux-2.4/patches/ar7 | |
| parent | f80d4fdc68858ba956a39e19ad6efa868beb827e (diff) | |
fix ethernet driver crash when using bridging
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1521 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.4/patches/ar7')
| -rw-r--r-- | target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch b/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch index e2b2ddd2b9..3da85ce980 100644 --- a/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch +++ b/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch @@ -815,8 +815,8 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpcommon_cpmac.h linux.dev/drive + diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/avalanche_cpmac/cpmac.c --- linux.old/drivers/net/avalanche_cpmac/cpmac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c 2005-07-12 03:21:00.298934472 +0200 -@@ -0,0 +1,2509 @@ ++++ linux.dev/drivers/net/avalanche_cpmac/cpmac.c 2005-07-22 01:03:12.609318544 +0200 +@@ -0,0 +1,2504 @@ +/****************************************************************************** + * FILE PURPOSE: CPMAC Linux Network Device Driver Source + ****************************************************************************** @@ -3035,12 +3035,7 @@ diff -urN linux.old/drivers/net/avalanche_cpmac/cpmac.c linux.dev/drivers/net/av + skb_trim(p_skb, packet_size); +#endif + -+#ifndef TI_SLOW_PATH -+ /* TI Optimization: This is NOT required if the ethernet resides below the bridge. But is -+ * required only if the ethernet is directly connected to the IP stack. */ -+ if (p_dev->br_port == NULL) -+#endif -+ p_skb->protocol = eth_type_trans(p_skb, p_dev); ++ p_skb->protocol = eth_type_trans(p_skb, p_dev); + + netif_rx(p_skb); + |