diff options
| author | Claudio Mignanti <c.mignanti@gmail.com> | 2010-07-22 11:32:42 +0000 |
|---|---|---|
| committer | Claudio Mignanti <c.mignanti@gmail.com> | 2010-07-22 11:32:42 +0000 |
| commit | d4d6fefdf27845273be0c49b53539334817aa3c6 (patch) | |
| tree | 72eb9cc4523168d9acf478a36b0d319ed609f355 /target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch | |
| parent | 4a829973275bc47a85e499b9f6f4872bacadb502 (diff) | |
| download | mtk-20170518-d4d6fefdf27845273be0c49b53539334817aa3c6.zip mtk-20170518-d4d6fefdf27845273be0c49b53539334817aa3c6.tar.gz mtk-20170518-d4d6fefdf27845273be0c49b53539334817aa3c6.tar.bz2 | |
general cleanup
SVN-Revision: 22352
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 | 28 |
1 files changed, 0 insertions, 28 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 deleted file mode 100644 index 756e014..0000000 --- a/target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/drivers/net/arm/at91_ether.c -+++ b/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; -+ unsigned long timeout = jiffies + HZ; - - if (!mii_link_ok(&lp->mii)) { /* no link */ - netif_carrier_off(dev); -@@ -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 */ -- 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; |