mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 18:22:27 +02:00
b84c7cd55b
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10975 3c298f89-4303-0410-b956-a3cf2f4a3e73
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
Index: linux-2.6.23.16/drivers/net/phy/phy_device.c
|
|
===================================================================
|
|
--- linux-2.6.23.16.orig/drivers/net/phy/phy_device.c 2008-04-20 10:16:21.000000000 +0200
|
|
+++ linux-2.6.23.16/drivers/net/phy/phy_device.c 2008-04-29 14:20:03.000000000 +0200
|
|
@@ -44,6 +44,18 @@
|
|
extern int mdio_bus_init(void);
|
|
extern void mdio_bus_exit(void);
|
|
|
|
+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;
|
|
@@ -67,6 +79,8 @@
|
|
dev->bus = bus;
|
|
|
|
dev->state = PHY_DOWN;
|
|
+ dev->netif_receive_skb = &generic_receive_skb;
|
|
+ dev->netif_rx = &generic_rx;
|
|
|
|
spin_lock_init(&dev->lock);
|
|
|
|
Index: linux-2.6.23.16/include/linux/phy.h
|
|
===================================================================
|
|
--- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 10:16:21.000000000 +0200
|
|
+++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 10:17:58.000000000 +0200
|
|
@@ -289,6 +289,17 @@
|
|
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);
|
|
};
|
|
#define to_phy_device(d) container_of(d, struct phy_device, dev)
|
|
|
|
Index: linux-2.6.23.16/include/linux/netdevice.h
|
|
===================================================================
|
|
--- linux-2.6.23.16.orig/include/linux/netdevice.h 2008-04-20 10:16:21.000000000 +0200
|
|
+++ linux-2.6.23.16/include/linux/netdevice.h 2008-04-20 10:17:58.000000000 +0200
|
|
@@ -426,6 +426,7 @@
|
|
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())
|