diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:09 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:09 +0000 |
commit | de4c4d35e17830170dba6aa1b3b025d93a7b3302 (patch) | |
tree | c57b3c28c8453826a6abcef3f83b80d72f732253 /target/linux/generic/patches-3.1/721-phy_packets.patch | |
parent | cead4b47abdebcb8506451b4a3e30028982161a1 (diff) | |
download | upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.tar.gz upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.tar.bz2 upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.zip |
linux/3.1: R.I.P.
SVN-Revision: 31891
Diffstat (limited to 'target/linux/generic/patches-3.1/721-phy_packets.patch')
-rw-r--r-- | target/linux/generic/patches-3.1/721-phy_packets.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/target/linux/generic/patches-3.1/721-phy_packets.patch b/target/linux/generic/patches-3.1/721-phy_packets.patch deleted file mode 100644 index 35a14b650a..0000000000 --- a/target/linux/generic/patches-3.1/721-phy_packets.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -149,6 +149,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); -+} -+ - static struct phy_device* phy_device_create(struct mii_bus *bus, - int addr, int phy_id) - { -@@ -180,6 +192,8 @@ static struct phy_device* phy_device_cre - dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr); - - dev->state = PHY_DOWN; -+ dev->netif_receive_skb = &generic_receive_skb; -+ dev->netif_rx = &generic_rx; - - mutex_init(&dev->lock); - INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -334,6 +334,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 -@@ -1153,6 +1153,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 lines mostly used on receive path (including eth_type_trans()) |