---

yaml --- r: 40150 b: refs/heads/master c: 733b736 h: refs/heads/master v: v3
git-mirror · Oct 12, 2006 · deb7c5b · deb7c5b
1 parent abb6ab9
commit deb7c5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73f5e28b336772c4b08ee82e5bf28ab872898ee1
+refs/heads/master: 733b736c91dd2c556f35dffdcf77e667cf10cefc
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -2702,6 +2702,7 @@ static void rtl8169_down(struct net_device *dev)
 	struct rtl8169_private *tp = netdev_priv(dev);
 	void __iomem *ioaddr = tp->mmio_addr;
 	unsigned int poll_locked = 0;
+	unsigned int intrmask;
 
 	rtl8169_delete_timer(dev);
 
@@ -2740,8 +2741,11 @@ static void rtl8169_down(struct net_device *dev)
 	 * 2) dev->change_mtu
 	 *    -> rtl8169_poll can not be issued again and re-enable the
 	 *       interruptions. Let's simply issue the IRQ down sequence again.
+	 *
+	 * No loop if hotpluged or major error (0xffff).
 	 */
-	if (RTL_R16(IntrMask))
+	intrmask = RTL_R16(IntrMask);
+	if (intrmask && (intrmask != 0xffff))
 		goto core_down;
 
 	rtl8169_tx_clear(tp);