diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-17 14:10:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-17 14:10:39 +0000 |
| commit | 5272f096fb0541852734245658d3247cc1395d2f (patch) | |
| tree | 8d1c382840f7148dc13b1f9ca30e753adb61a929 /target/linux/generic/patches-2.6.35/630-phy_packets.patch | |
| parent | 3770e0e7facafd3c2f9d0a73b5e1b93c97affc97 (diff) | |
| download | upstream-5272f096fb0541852734245658d3247cc1395d2f.tar.gz upstream-5272f096fb0541852734245658d3247cc1395d2f.tar.bz2 upstream-5272f096fb0541852734245658d3247cc1395d2f.zip | |
kernel: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22252 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.35/630-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/630-phy_packets.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.35/630-phy_packets.patch b/target/linux/generic/patches-2.6.35/630-phy_packets.patch index fd6d0d2438..93ec8f947e 100644 --- a/target/linux/generic/patches-2.6.35/630-phy_packets.patch +++ b/target/linux/generic/patches-2.6.35/630-phy_packets.patch @@ -19,7 +19,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) { struct phy_device *dev; -@@ -175,6 +187,8 @@ struct phy_device* phy_device_create(str +@@ -176,6 +188,8 @@ struct phy_device* phy_device_create(str dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr); dev->state = PHY_DOWN; @@ -30,7 +30,7 @@ INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -325,6 +325,20 @@ struct phy_device { +@@ -330,6 +330,20 @@ struct phy_device { void (*adjust_link)(struct net_device *dev); void (*adjust_state)(struct net_device *dev); @@ -53,7 +53,7 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -863,6 +863,7 @@ struct net_device { +@@ -932,6 +932,7 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ |