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 | 6d2ba97481de5894a796a384a85126053bfcf25f (patch) | |
| tree | 4a23a5ed448fd40c6f12dbf60c409f6cf6d860ba /target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch | |
| parent | a0a21d42684a78d27683115297ef16457ca64d12 (diff) | |
| download | upstream-6d2ba97481de5894a796a384a85126053bfcf25f.tar.gz upstream-6d2ba97481de5894a796a384a85126053bfcf25f.tar.bz2 upstream-6d2ba97481de5894a796a384a85126053bfcf25f.zip | |
[kernel] update to 2.6.25.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 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.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 */ |