diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:49:28 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:49:28 +0000 |
| commit | 93e8eb8171803d3c4c790e37ca6f6f23a2cff563 (patch) | |
| tree | 0cd12d5dcfabdc8212f758bb9724f64ddcf97bd6 /target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch | |
| parent | f9518d9a74d4a418e32a48365dde1fc6b1b14387 (diff) | |
| download | upstream-93e8eb8171803d3c4c790e37ca6f6f23a2cff563.tar.gz upstream-93e8eb8171803d3c4c790e37ca6f6f23a2cff563.tar.bz2 upstream-93e8eb8171803d3c4c790e37ca6f6f23a2cff563.zip | |
refresh generic 2.6.26 patches
SVN-Revision: 11336
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch index 22654db8fb..e52f11a294 100644 --- a/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch +++ b/target/linux/generic-2.6/patches-2.6.26/630-phy_packets.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -53,6 +53,18 @@ - phy_device_free(to_phy_device(dev)); +@@ -143,6 +143,18 @@ } + EXPORT_SYMBOL(phy_scan_fixups); +static int generic_receive_skb(struct sk_buff *skb) +{ @@ -19,7 +19,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) { struct phy_device *dev; -@@ -78,6 +90,8 @@ +@@ -168,6 +180,8 @@ dev->bus = bus; dev->state = PHY_DOWN; @@ -30,7 +30,7 @@ --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -295,6 +295,17 @@ +@@ -309,6 +309,17 @@ void (*adjust_link)(struct net_device *dev); void (*adjust_state)(struct net_device *dev); @@ -50,7 +50,7 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -595,6 +595,7 @@ +@@ -609,6 +609,7 @@ void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ |