diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-15 21:31:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-15 21:31:01 +0000 |
| commit | 235e3319876d5d1354e2774ec73495fdeb2616ec (patch) | |
| tree | d776ac5daed14d9e6ee5562e979d388420e8ff08 /target/linux/generic/patches-3.0/721-phy_packets.patch | |
| parent | 0db9c2bd7d3620ba18fa784bda702d971783b4f6 (diff) | |
| download | upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.gz upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.bz2 upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.zip | |
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
SVN-Revision: 27191
Diffstat (limited to 'target/linux/generic/patches-3.0/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-3.0/721-phy_packets.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/721-phy_packets.patch b/target/linux/generic/patches-3.0/721-phy_packets.patch new file mode 100644 index 0000000000..ab86bbea3b --- /dev/null +++ b/target/linux/generic/patches-3.0/721-phy_packets.patch @@ -0,0 +1,63 @@ +--- 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 +@@ -332,6 +332,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 +@@ -1194,6 +1194,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()) |