From 2c4e287c1d8863c0cce34ebdf3dd72ad5009e8a6 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Jul 2005 15:50:56 +0000 Subject: [PATCH] fix ethernet driver crash when using bridging git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1521 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux-2.4/patches/ar7/003-net_driver_cpmac.patch | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch b/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch index e2b2ddd2b..3da85ce98 100644 --- a/openwrt/target/linux/linux-2.4/patches/ar7/003-net_driver_cpmac.patch +++ b/openwrt/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); + -- 2.20.1