preliminary ixp4xx 2.6.28 support

[openwrt.git] / target / linux / ar7 / patches-2.6.24 / 900-temporary_cpmac_hack.diff

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 0a2224f..dfd1a67 100644 (file)
--- 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);
        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;
                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;
                }
  
                        priv->oldspeed = priv->phy->speed;
                }