openwrt/upstream - upstream openwrt

	Commit message (Expand)	Author	Age	Files	Lines
*	merge: base: update base-files and basic config	Zoltan HERPAI	2017-12-08	1	-3/+3
*	README: Update project README	Kevin Darbyshire-Bryant	2016-05-12	1	-1/+1
*	README: Remove outdated info	Jo-Philipp Wich	2016-05-11	1	-6/+0
*	branding: add LEDE branding	John Crispin	2016-03-24	1	-4/+4
*	Add 'subversion' build dependency to README	Felix Fietkau	2014-08-31	1	-2/+2
*	build: BSD compile fixes	Felix Fietkau	2013-03-07	1	-2/+2
*	Update README file	Mirko Vogt	2013-03-06	1	-2/+3
*	trying to make README file a bit more helpful	Mirko Vogt	2012-01-21	1	-6/+14
*	remove bison requirement (see [10398] & [14900])	Nicolas Thill	2010-03-05	1	-1/+1
*	change readme to point to scripts/flashing/flash.sh instead of scripts/flash.sh	Felix Fietkau	2008-12-31	1	-2/+2
*	add information about the tex4ht requirement for the docs	Felix Fietkau	2007-02-26	1	-1/+1
*	Update the README to something more realistic	Florian Fainelli	2007-01-05	1	-2/+4
*	finally move buildroot-ng to trunk	Felix Fietkau	2016-03-20	1	-0/+24

--- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -146,6 +146,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; @@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str 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 @@ -325,6 +325,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 @@ -863,6 +863,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())