diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2007-07-29 04:26:11 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2007-07-29 04:26:11 +0000 |
| commit | b83bb8ccb14c8c20944a7f86783657ec042a6cd5 (patch) | |
| tree | 60389d519ee71d324df2955b38521cb57b29a74a /target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch | |
| parent | 5ed12e1ebb9aa4953c7372080a9216b11f158edc (diff) | |
| download | upstream-b83bb8ccb14c8c20944a7f86783657ec042a6cd5.tar.gz upstream-b83bb8ccb14c8c20944a7f86783657ec042a6cd5.tar.bz2 upstream-b83bb8ccb14c8c20944a7f86783657ec042a6cd5.zip | |
Prepare for 2.6.22.1 kernel
SVN-Revision: 8212
Diffstat (limited to 'target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch')
| -rw-r--r-- | target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch b/target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch new file mode 100644 index 0000000000..9ad8c42530 --- /dev/null +++ b/target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch @@ -0,0 +1,28 @@ +--- 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 @@ + struct at91_private *lp = netdev_priv(dev); + unsigned int bmsr, bmcr, lpa, mac_cfg; + unsigned int speed, duplex; ++ unsigned long timeout = jiffies + HZ; + + if (!mii_link_ok(&lp->mii)) { /* no link */ + netif_carrier_off(dev); +@@ -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 */ +- if (!(bmsr & BMSR_ANEGCOMPLETE)) +- return; /* Do nothing - another interrupt generated when negotiation complete */ ++ while (!(bmsr & BMSR_ANEGCOMPLETE)) { ++ if (time_after(jiffies, timeout)) { ++ printk("at91_ether: Auto-negotiate timeout\n"); ++ return; ++ } ++ read_phy(lp->phy_address, MII_BMSR, &bmsr); ++ read_phy(lp->phy_address, MII_BMCR, &bmcr); ++ cpu_relax(); ++ } + + read_phy(lp->phy_address, MII_LPA, &lpa); + if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100; |