aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-21 14:16:11 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-21 14:16:11 -0400
commit12cbbd95e12e911b43afae7f6f4850f616223642 (patch)
tree6965c1adee8a020288ef0fb6ebe57a4435468efc /drivers/net/r8169.c
parentaf60496f746596fdbc7a9ffa1a96f97e1bc59bcf (diff)
parent733b736c91dd2c556f35dffdcf77e667cf10cefc (diff)
Merge tag 'jg-20061012-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into tmp
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r--drivers/net/r8169.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f1c75751cab7..d132fe7d475e 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -214,6 +214,7 @@ static struct pci_device_id rtl8169_pci_tbl[] = {
214 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_2 }, 214 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_2 },
215 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, 215 { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
216 { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, 216 { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
217 { PCI_DEVICE(0x1259, 0xc107), 0, 0, RTL_CFG_0 },
217 { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 }, 218 { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 },
218 { PCI_VENDOR_ID_LINKSYS, 0x1032, 219 { PCI_VENDOR_ID_LINKSYS, 0x1032,
219 PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 }, 220 PCI_ANY_ID, 0x0024, 0, 0, RTL_CFG_0 },
@@ -2700,6 +2701,7 @@ static void rtl8169_down(struct net_device *dev)
2700 struct rtl8169_private *tp = netdev_priv(dev); 2701 struct rtl8169_private *tp = netdev_priv(dev);
2701 void __iomem *ioaddr = tp->mmio_addr; 2702 void __iomem *ioaddr = tp->mmio_addr;
2702 unsigned int poll_locked = 0; 2703 unsigned int poll_locked = 0;
2704 unsigned int intrmask;
2703 2705
2704 rtl8169_delete_timer(dev); 2706 rtl8169_delete_timer(dev);
2705 2707
@@ -2738,8 +2740,11 @@ core_down:
2738 * 2) dev->change_mtu 2740 * 2) dev->change_mtu
2739 * -> rtl8169_poll can not be issued again and re-enable the 2741 * -> rtl8169_poll can not be issued again and re-enable the
2740 * interruptions. Let's simply issue the IRQ down sequence again. 2742 * interruptions. Let's simply issue the IRQ down sequence again.
2743 *
2744 * No loop if hotpluged or major error (0xffff).
2741 */ 2745 */
2742 if (RTL_R16(IntrMask)) 2746 intrmask = RTL_R16(IntrMask);
2747 if (intrmask && (intrmask != 0xffff))
2743 goto core_down; 2748 goto core_down;
2744 2749
2745 rtl8169_tx_clear(tp); 2750 rtl8169_tx_clear(tp);