aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 06:35:41 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 06:35:41 +0000
commitd132c5f42c208e4ab1bb3be0a7503262ee7e4059 (patch)
treeb645c48446cbc10d239bb8f2fcfbd72c25e89a00 /target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
parent06b0688a472009f4371efba1135f4aac19593609 (diff)
downloadupstream-d132c5f42c208e4ab1bb3be0a7503262ee7e4059.tar.gz
upstream-d132c5f42c208e4ab1bb3be0a7503262ee7e4059.tar.bz2
upstream-d132c5f42c208e4ab1bb3be0a7503262ee7e4059.zip
refresh kernel patches
SVN-Revision: 11195
Diffstat (limited to 'target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch')
-rw-r--r--target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
index 9ad8c42530..7d7d51f5d0 100644
--- a/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
+++ b/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
@@ -1,6 +1,8 @@
---- linux-2.6.21.1/drivers/net/arm/at91_ether.c.old 2007-06-04 18:15:49.000000000 +0200
-+++ linux-2.6.21.1/drivers/net/arm/at91_ether.c 2007-06-04 18:10:36.000000000 +0200
-@@ -146,6 +146,7 @@
+Index: linux-2.6.21.7/drivers/net/arm/at91_ether.c
+===================================================================
+--- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.c
++++ linux-2.6.21.7/drivers/net/arm/at91_ether.c
+@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
struct at91_private *lp = netdev_priv(dev);
unsigned int bmsr, bmcr, lpa, mac_cfg;
unsigned int speed, duplex;
@@ -8,7 +10,7 @@
if (!mii_link_ok(&lp->mii)) { /* no link */
netif_carrier_off(dev);
-@@ -158,8 +159,15 @@
+@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
read_phy(lp->phy_address, MII_BMSR, &bmsr);
read_phy(lp->phy_address, MII_BMCR, &bmcr);
if (bmcr & BMCR_ANENABLE) { /* AutoNegotiation is enabled */