summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
diff options
context:
space:
mode:
authormatteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-12 22:33:48 +0000
committermatteo <matteo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-12 22:33:48 +0000
commit6ad8779764274df042b2a3ab03bc990c1066c476 (patch)
treedba3f59b72225e7ebbf85b428546bd2d98771f51 /target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
parentcc9d1c8eb89659f16db9e3905bbe4a05f1c20e76 (diff)
ar7: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11452 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff')
-rw-r--r--target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
index b84cbf036..16e21f84d 100644
--- a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
@@ -1,18 +1,16 @@
-Index: linux-2.6.25.4/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/cpmac.c
-+++ linux-2.6.25.4/drivers/net/cpmac.c
-@@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -947,7 +947,8 @@
int new_state = 0;
spin_lock(&priv->lock);
- if (priv->phy->link) {
-+ if (1 /* priv->phy->link */ ) {
++ if (1 /* priv->phy->link */) {
+ netif_carrier_on(dev);
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
+@@ -959,11 +960,11 @@
priv->oldspeed = priv->phy->speed;
}