diff options
| author | Matteo Croce <rootkit85@yahoo.it> | 2008-05-13 00:10:45 +0000 |
|---|---|---|
| committer | Matteo Croce <rootkit85@yahoo.it> | 2008-05-13 00:10:45 +0000 |
| commit | 2058b8096491f4976710ecbd1d70d82c4ffaae13 (patch) | |
| tree | 44147cf5f33a794e33e03536210590522f61b077 /target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch | |
| parent | 06c7c0428831969f02dcb5585edb859cf7025640 (diff) | |
| download | upstream-2058b8096491f4976710ecbd1d70d82c4ffaae13.tar.gz upstream-2058b8096491f4976710ecbd1d70d82c4ffaae13.tar.bz2 upstream-2058b8096491f4976710ecbd1d70d82c4ffaae13.zip | |
atheros: added marvell switch driver
SVN-Revision: 11129
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch new file mode 100644 index 0000000000..930139b556 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch @@ -0,0 +1,66 @@ +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-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 = &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 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); + + 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-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, + assign before registering */ ++ void *phy_ptr; /* PHY device specific data */ + + /* + * Cache line mostly used on receive path (including eth_type_trans()) |