refresh generic 2.6.23 patches in upstream style
SVN-Revision: 11366
This commit is contained in:
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user