---

yaml --- r: 45046 b: refs/heads/master c: 25d82d7 h: refs/heads/master v: v3
git-mirror · Dec 26, 2006 · efbf73e · efbf73e
1 parent 72756b5
commit efbf73e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce9f7fe3c3f5b9ed1d3e91db78c45d0df5672816
+refs/heads/master: 25d82d7a2fc20cc4be414d738139594dc0adf179
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -1511,6 +1511,13 @@ static int sky2_down(struct net_device *dev)
 	imask &= ~portirq_msk[port];
 	sky2_write32(hw, B0_IMSK, imask);
 
+	/*
+	 * Both ports share the NAPI poll on port 0, so if necessary undo the
+	 * the disable that is done in dev_close.
+	 */
+	if (sky2->port == 0 && hw->ports > 1)
+		netif_poll_enable(dev);
+
 	sky2_gmac_reset(hw, port);
 
 	/* Stop transmitter */