diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-06 16:27:37 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-06 16:27:37 +0000 |
| commit | 17c7b6c3fdc48301e50d22cc6138ede16bd1be24 (patch) | |
| tree | a5d41b991a151e72663527a96fbc6c494565d65c /target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch | |
| parent | 5389989abaa52926b22f9f030d1481df1e73d745 (diff) | |
strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8653 3c298f89-4303-0410-b956-a3cf2f4a3e73
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, 0 insertions, 28 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 deleted file mode 100644 index 9ad8c4253..000000000 --- a/target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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; |