From 653cf2c07823504a601aacf9fe310c3766995880 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 29 Apr 2008 12:55:44 +0000 Subject: enable a different pseudo-vlan mode in the marvell switch (uses a proprietary header instead of a proprietary trailer) - fixes some mtu issues git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10975 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.23/630-phy_packets.patch | 37 ++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.23') diff --git a/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch index 5d7f97195f..930139b556 100644 --- a/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch +++ b/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch @@ -1,20 +1,39 @@ Index: linux-2.6.23.16/drivers/net/phy/phy_device.c =================================================================== ---- linux-2.6.23.16.orig/drivers/net/phy/phy_device.c 2008-02-11 07:06:32.000000000 +0100 -+++ linux-2.6.23.16/drivers/net/phy/phy_device.c 2008-04-20 05:42:28.000000000 +0200 -@@ -67,6 +67,8 @@ +--- linux-2.6.23.16.orig/drivers/net/phy/phy_device.c 2008-04-20 10:16:21.000000000 +0200 ++++ linux-2.6.23.16/drivers/net/phy/phy_device.c 2008-04-29 14:20:03.000000000 +0200 +@@ -44,6 +44,18 @@ + extern int mdio_bus_init(void); + extern void mdio_bus_exit(void); + ++static int generic_receive_skb(struct sk_buff *skb) ++{ ++ skb->protocol = eth_type_trans(skb, skb->dev); ++ return netif_receive_skb(skb); ++} ++ ++static int generic_rx(struct sk_buff *skb) ++{ ++ skb->protocol = eth_type_trans(skb, skb->dev); ++ return netif_rx(skb); ++} ++ + struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) + { + struct phy_device *dev; +@@ -67,6 +79,8 @@ dev->bus = bus; dev->state = PHY_DOWN; -+ dev->netif_receive_skb = &netif_receive_skb; -+ dev->netif_rx = &netif_rx; ++ dev->netif_receive_skb = &generic_receive_skb; ++ dev->netif_rx = &generic_rx; spin_lock_init(&dev->lock); Index: linux-2.6.23.16/include/linux/phy.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 04:40:31.000000000 +0200 -+++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 05:53:21.000000000 +0200 +--- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 10:16:21.000000000 +0200 ++++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 10:17:58.000000000 +0200 @@ -289,6 +289,17 @@ void (*adjust_link)(struct net_device *dev); @@ -35,8 +54,8 @@ Index: linux-2.6.23.16/include/linux/phy.h Index: linux-2.6.23.16/include/linux/netdevice.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/netdevice.h 2008-02-11 07:06:32.000000000 +0100 -+++ linux-2.6.23.16/include/linux/netdevice.h 2008-04-20 06:33:25.000000000 +0200 +--- linux-2.6.23.16.orig/include/linux/netdevice.h 2008-04-20 10:16:21.000000000 +0200 ++++ linux-2.6.23.16/include/linux/netdevice.h 2008-04-20 10:17:58.000000000 +0200 @@ -426,6 +426,7 @@ void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, -- cgit v1.2.3