diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-07-17 16:20:25 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-07-17 16:20:25 +0000 |
commit | 12b429b3a22e870677c36d758f1874933f9a572c (patch) | |
tree | fbe30fe3aa1ff9edd3d55707b78c1547623e303f /target/linux/generic-2.6/patches-2.6.29/630-phy_packets.patch | |
parent | fe05e1f37a10a417befa038a58bfe5f0388a2e2f (diff) | |
download | master-31e0f0ae-12b429b3a22e870677c36d758f1874933f9a572c.tar.gz master-31e0f0ae-12b429b3a22e870677c36d758f1874933f9a572c.tar.bz2 master-31e0f0ae-12b429b3a22e870677c36d758f1874933f9a572c.zip |
get rid of linux 2.6.29
SVN-Revision: 16883
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/630-phy_packets.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/630-phy_packets.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.29/630-phy_packets.patch deleted file mode 100644 index f420115f31..0000000000 --- a/target/linux/generic-2.6/patches-2.6.29/630-phy_packets.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -143,6 +143,18 @@ int phy_scan_fixups(struct phy_device *p - } - EXPORT_SYMBOL(phy_scan_fixups); - -+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; -@@ -168,6 +180,8 @@ struct phy_device* phy_device_create(str - dev->bus = bus; - - dev->state = PHY_DOWN; -+ dev->netif_receive_skb = &generic_receive_skb; -+ dev->netif_rx = &generic_rx; - - mutex_init(&dev->lock); - ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -326,6 +326,20 @@ struct phy_device { - 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); -+ -+ /* alignment offset for packets */ -+ int pkt_align; - }; - #define to_phy_device(d) container_of(d, struct phy_device, dev) - ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -747,6 +747,7 @@ struct net_device - 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()) |