diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 10:53:23 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-07-26 10:53:23 +0000 |
commit | 104b3386a23c4179fb3a993bed106c256625a70d (patch) | |
tree | 2fe999020575731d650df26a0a188e045f2db29e /target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch | |
parent | bdfc0556b878cc06a0741983227a8f166079c50d (diff) | |
download | upstream-104b3386a23c4179fb3a993bed106c256625a70d.tar.gz upstream-104b3386a23c4179fb3a993bed106c256625a70d.tar.bz2 upstream-104b3386a23c4179fb3a993bed106c256625a70d.zip |
update to 2.6.25.12
SVN-Revision: 11933
Diffstat (limited to 'target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch')
-rw-r--r-- | target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch | 10 |
1 files changed, 4 insertions, 6 deletions
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 120c32e283..a84851298e 100644 --- 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; @@ -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); -@@ -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 */ |