You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
--- 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
|
|
@@ -339,6 +339,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
|
|
@@ -1134,6 +1134,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())
|