diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2008-07-08 06:13:54 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2008-07-08 06:13:54 +0000 |
| commit | 40e85a7d5dd9ae5facba0fc0a0208500a4619dfa (patch) | |
| tree | b65d0132af51e2aae959748a9a72ed5ff5328f6f /target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch | |
| parent | 22754b63e7ac756b14d753fc61c6795004f79690 (diff) | |
| download | upstream-40e85a7d5dd9ae5facba0fc0a0208500a4619dfa.tar.gz upstream-40e85a7d5dd9ae5facba0fc0a0208500a4619dfa.tar.bz2 upstream-40e85a7d5dd9ae5facba0fc0a0208500a4619dfa.zip | |
Removed patches and config for non-functional 2.6.22 kernel
SVN-Revision: 11746
Diffstat (limited to 'target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch')
| -rw-r--r-- | target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch deleted file mode 100644 index 120c32e283..0000000000 --- a/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch +++ /dev/null @@ -1,30 +0,0 @@ -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_ - 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; |