aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 07:06:35 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 07:06:35 +0000
commit249455db69bf558c386ba7bde050844e2f0ec2b3 (patch)
tree96c29c280eab70614388fc2b578b5a1668664603 /target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
parent46dc775878ae30e4e08f56a735554693b4078db9 (diff)
downloadmaster-187ad058-249455db69bf558c386ba7bde050844e2f0ec2b3.tar.gz
master-187ad058-249455db69bf558c386ba7bde050844e2f0ec2b3.tar.bz2
master-187ad058-249455db69bf558c386ba7bde050844e2f0ec2b3.zip
[ar7] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11196 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff')
-rw-r--r--target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff10
1 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
index 0a2224f683..dfd1a67479 100644
--- a/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
@@ -1,6 +1,8 @@
---- linux-2.6.24.2/drivers/net/cpmac.c 2008-03-10 22:13:50.000000000 +0100
-+++ linux-2.6.24.2/drivers/net/cpmac.c 2008-03-05 15:13:27.000000000 +0100
-@@ -841,7 +841,8 @@
+Index: linux-2.6.24.7/drivers/net/cpmac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/cpmac.c
++++ linux-2.6.24.7/drivers/net/cpmac.c
+@@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
int new_state = 0;
spin_lock(&priv->lock);
@@ -10,7 +12,7 @@
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -853,11 +854,11 @@
+@@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
priv->oldspeed = priv->phy->speed;
}