port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but...

[openwrt.git] / target / linux / at91 / patches-2.6.25 / 010-dm9161a-phyfix.patch

diff --git a/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
index 120c32e..a848512 100644 (file)
--- a/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
+++ b/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c
-===================================================================
---- linux-2.6.22.19.orig/drivers/net/arm/at91_ether.c
-+++ linux-2.6.22.19/drivers/net/arm/at91_ether.c
-@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
+--- a/drivers/net/arm/at91_ether.c
++++ b/drivers/net/arm/at91_ether.c
+@@ -146,6 +146,7 @@

        struct at91_private *lp = netdev_priv(dev);
        unsigned int bmsr, bmcr, lpa, mac_cfg;
        unsigned int speed, duplex;
        struct at91_private *lp = netdev_priv(dev);
        unsigned int bmsr, bmcr, lpa, mac_cfg;
        unsigned int speed, duplex;


@@ -10,7 +8,7 @@ Index: linux-2.6.22.19/drivers/net/arm/at91_ether.c
  
        if (!mii_link_ok(&lp->mii)) {           /* no link */
                netif_carrier_off(dev);
  
        if (!mii_link_ok(&lp->mii)) {           /* no link */
                netif_carrier_off(dev);

-@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
+@@ -158,8 +159,15 @@

        read_phy(lp->phy_address, MII_BMSR, &bmsr);
        read_phy(lp->phy_address, MII_BMCR, &bmcr);
        if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
        read_phy(lp->phy_address, MII_BMSR, &bmsr);
        read_phy(lp->phy_address, MII_BMCR, &bmcr);
        if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */