diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-05 17:01:00 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-05 17:01:00 +0000 |
| commit | 6ffc241131436ea399f2afe5d144c4f5eed79f49 (patch) | |
| tree | b842888957a92e8af753d25b456fb0060e3880a8 /target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch | |
| parent | 1e1f3be69922a72a8cb37ed0b1d93f30c638fe3f (diff) | |
| download | master-187ad058-6ffc241131436ea399f2afe5d144c4f5eed79f49.tar.gz master-187ad058-6ffc241131436ea399f2afe5d144c4f5eed79f49.tar.bz2 master-187ad058-6ffc241131436ea399f2afe5d144c4f5eed79f49.zip | |
refresh generic 2.6.23 patches in upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11366 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch index 1f26f2375e..32d6c2fddd 100644 --- a/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch +++ b/target/linux/generic-2.6/patches-2.6.23/630-phy_packets.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.23.17/drivers/net/phy/phy_device.c -=================================================================== ---- linux-2.6.23.17.orig/drivers/net/phy/phy_device.c -+++ linux-2.6.23.17/drivers/net/phy/phy_device.c -@@ -44,6 +44,18 @@ static struct phy_driver genphy_driver; +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -44,6 +44,18 @@ extern int mdio_bus_init(void); extern void mdio_bus_exit(void); @@ -21,7 +19,7 @@ Index: linux-2.6.23.17/drivers/net/phy/phy_device.c struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) { struct phy_device *dev; -@@ -67,6 +79,8 @@ struct phy_device* phy_device_create(str +@@ -67,6 +79,8 @@ dev->bus = bus; dev->state = PHY_DOWN; @@ -30,11 +28,9 @@ Index: linux-2.6.23.17/drivers/net/phy/phy_device.c spin_lock_init(&dev->lock); -Index: linux-2.6.23.17/include/linux/phy.h -=================================================================== ---- linux-2.6.23.17.orig/include/linux/phy.h -+++ linux-2.6.23.17/include/linux/phy.h -@@ -289,6 +289,17 @@ struct phy_device { +--- a/include/linux/phy.h ++++ b/include/linux/phy.h +@@ -289,6 +289,17 @@ void (*adjust_link)(struct net_device *dev); void (*adjust_state)(struct net_device *dev); @@ -52,11 +48,9 @@ Index: linux-2.6.23.17/include/linux/phy.h }; #define to_phy_device(d) container_of(d, struct phy_device, dev) -Index: linux-2.6.23.17/include/linux/netdevice.h -=================================================================== ---- linux-2.6.23.17.orig/include/linux/netdevice.h -+++ linux-2.6.23.17/include/linux/netdevice.h -@@ -426,6 +426,7 @@ struct net_device +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -426,6 +426,7 @@ void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ |