[kernel] upgrade to 2.6.25.7, and refresh patches

[openwrt/svn-archive/archive.git] / target / linux / ar7 / patches-2.6.25 / 900-temporary_cpmac_hack.diff

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 b84cbf03661e35df00f25f8c1cbce09e21188e9f..7da22cd99c9cb25c66795f186253c0432598f60b 100644 (file)
--- 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
+@@ -936,7 +936,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
+@@ -948,11 +949,11 @@
                        priv->oldspeed = priv->phy->speed;
                }