aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/630-phy_packets.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
commit76f0b54cd5e718183374acb8bd4e0e00eb91ca17 (patch)
tree0c8716c5e67d2f8142dc9e18a5bac307c709c041 /target/linux/generic/patches-2.6.36/630-phy_packets.patch
parent3784ca2da7f11cd7f8301e52a475459331a8fc5a (diff)
downloadupstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.gz
upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.bz2
upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.zip
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/630-phy_packets.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/630-phy_packets.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.36/630-phy_packets.patch b/target/linux/generic/patches-2.6.36/630-phy_packets.patch
index 93ec8f947e..57fe19f41b 100644
--- a/target/linux/generic/patches-2.6.36/630-phy_packets.patch
+++ b/target/linux/generic/patches-2.6.36/630-phy_packets.patch
@@ -30,7 +30,7 @@
INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -330,6 +330,20 @@ struct phy_device {
+@@ -332,6 +332,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
-@@ -932,6 +932,7 @@ struct net_device {
+@@ -949,6 +949,7 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */