update to 2.6.26.5 and 2.6.25.17
[openwrt/openwrt.git] / target / linux / ar7 / patches-2.6.26 / 900-temporary_cpmac_hack.diff
index 7da22cd99c9cb25c66795f186253c0432598f60b..43479f881e244d83bd8d82e45d1e1ad5f84be3f8 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -936,7 +936,8 @@
+@@ -948,7 +948,8 @@
        int new_state = 0;
  
        spin_lock(&priv->lock);
@@ -10,7 +10,7 @@
                netif_start_queue(dev);
                if (priv->phy->duplex != priv->oldduplex) {
                        new_state = 1;
-@@ -948,11 +949,11 @@
+@@ -960,11 +961,11 @@
                        priv->oldspeed = priv->phy->speed;
                }