diff options
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch | 47 | ||||
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch | 52 |
2 files changed, 99 insertions, 0 deletions
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 new file mode 100644 index 0000000..5d7f971 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch @@ -0,0 +1,47 @@ +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 @@ + dev->bus = bus; + + dev->state = PHY_DOWN; ++ dev->netif_receive_skb = &netif_receive_skb; ++ dev->netif_rx = &netif_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 +@@ -289,6 +289,17 @@ + void (*adjust_link)(struct net_device *dev); + + void (*adjust_state)(struct net_device *dev); ++ ++ /* ++ * By default these point to the original functions ++ * with the same name. adding them to the phy_device ++ * allows the phy driver to override them for packet ++ * mangling if the ethernet driver supports it ++ * This is required to support some really horrible ++ * switches such as the Marvell 88E6060 ++ */ ++ int (*netif_receive_skb)(struct sk_buff *skb); ++ int (*netif_rx)(struct sk_buff *skb); + }; + #define to_phy_device(d) container_of(d, struct phy_device, dev) + +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 +@@ -426,6 +426,7 @@ + void *ax25_ptr; /* AX.25 specific data */ + struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, + assign before registering */ ++ void *phy_ptr; /* PHY device specific data */ + + /* + * Cache line mostly used on receive path (including eth_type_trans()) diff --git a/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch b/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch new file mode 100644 index 0000000..15c6e48 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.23/640-mvswitch.patch @@ -0,0 +1,52 @@ +Index: linux-2.6.23.16/drivers/net/phy/Kconfig +=================================================================== +--- linux-2.6.23.16.orig/drivers/net/phy/Kconfig 2008-04-20 07:31:20.000000000 +0200 ++++ linux-2.6.23.16/drivers/net/phy/Kconfig 2008-04-20 08:57:26.000000000 +0200 +@@ -65,6 +65,12 @@ + ---help--- + Currently supports the ADM6996F switch + ++config MVSWITCH_PHY ++ tristate "Driver for Marvell switches" ++ select VLAN_8021Q ++ ---help--- ++ Currently supports the Marvell 88E6060 switch. ++ + config FIXED_PHY + tristate "Drivers for PHY emulation on fixed speed/link" + ---help--- +Index: linux-2.6.23.16/drivers/net/phy/Makefile +=================================================================== +--- linux-2.6.23.16.orig/drivers/net/phy/Makefile 2008-04-20 07:31:20.000000000 +0200 ++++ linux-2.6.23.16/drivers/net/phy/Makefile 2008-04-20 07:31:34.000000000 +0200 +@@ -13,4 +13,5 @@ + obj-$(CONFIG_BROADCOM_PHY) += broadcom.o + obj-$(CONFIG_ICPLUS_PHY) += icplus.o + obj-$(CONFIG_ADM6996_PHY) += adm6996.o ++obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o + obj-$(CONFIG_FIXED_PHY) += fixed.o +Index: linux-2.6.23.16/drivers/net/phy/mdio_bus.c +=================================================================== +--- linux-2.6.23.16.orig/drivers/net/phy/mdio_bus.c 2008-04-20 04:40:31.000000000 +0200 ++++ linux-2.6.23.16/drivers/net/phy/mdio_bus.c 2008-04-20 07:34:08.000000000 +0200 +@@ -35,6 +35,12 @@ + #include <asm/irq.h> + #include <asm/uaccess.h> + ++static void mdio_dev_release(struct device *dev) ++{ ++ /* nothing to do */ ++} ++ ++ + /** + * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus + * @bus: target mii_bus +@@ -85,6 +91,7 @@ + + phydev->dev.parent = bus->dev; + phydev->dev.bus = &mdio_bus_type; ++ phydev->dev.release = mdio_dev_release; + snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, i); + + phydev->bus = bus; |