aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
commitd35bad03e31bd861e231c8c68799c62752b56fa8 (patch)
treee4dff5e623cd35ac5d02b823ba3aeb517e490275 /target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
parenta1bf28950d16ca97897a524dc74ec0e52ef08fff (diff)
downloadupstream-d35bad03e31bd861e231c8c68799c62752b56fa8.tar.gz
upstream-d35bad03e31bd861e231c8c68799c62752b56fa8.tar.bz2
upstream-d35bad03e31bd861e231c8c68799c62752b56fa8.zip
update to 2.6.25.19, and refresh patches
SVN-Revision: 13137
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
index 22654db8fb..6115487ddd 100644
--- a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -53,6 +53,18 @@
+@@ -53,6 +53,18 @@ static void phy_device_release(struct de
phy_device_free(to_phy_device(dev));
}
@@ -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 @@
+@@ -78,6 +90,8 @@ struct phy_device* phy_device_create(str
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 @@
+@@ -295,6 +295,17 @@ struct phy_device {
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 @@
+@@ -595,6 +595,7 @@ struct net_device
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */