aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-07 08:44:56 +0000
commita4ffbea09c88fbe9cefcf0080eda0809598f3ee1 (patch)
treef3261452de6d5a1c11fd8ed250f2a42f6d0eb008 /target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
parentd9d70c2ebb0ad11fc61be3e9bc7148fe2106ab76 (diff)
downloadmaster-187ad058-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.gz
master-187ad058-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.tar.bz2
master-187ad058-a4ffbea09c88fbe9cefcf0080eda0809598f3ee1.zip
[kernel] update to 2.6.25.19, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch4
1 files changed, 2 insertions, 2 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 a84851298e..756e014f02 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,6 +1,6 @@
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
-@@ -146,6 +146,7 @@
+@@ -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 +8,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 */