diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:30:57 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-16 18:30:57 +0000 |
| commit | 80a4ffa1e2bc5f3ef893251babb2371c502f04ad (patch) | |
| tree | e6fb6200183e257b8f8cf45857f359b053bd2a0d /target/linux/generic/patches-2.6.38/721-phy_packets.patch | |
| parent | a0559785226c7d84cf34686c0d5be8f4e15fdfe6 (diff) | |
| download | upstream-80a4ffa1e2bc5f3ef893251babb2371c502f04ad.tar.gz upstream-80a4ffa1e2bc5f3ef893251babb2371c502f04ad.tar.bz2 upstream-80a4ffa1e2bc5f3ef893251babb2371c502f04ad.zip | |
kernel: reorganize 2.6.38 patches, clean up block2mtd patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26690 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.38/721-phy_packets.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.38/721-phy_packets.patch b/target/linux/generic/patches-2.6.38/721-phy_packets.patch new file mode 100644 index 0000000000..640a19bb00 --- /dev/null +++ b/target/linux/generic/patches-2.6.38/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 +@@ -1003,6 +1003,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()) |