---

yaml --- r: 56545 b: refs/heads/master c: 84787e3 h: refs/heads/master i: 56543: dbfa825 v: v3
git-mirror · May 18, 2007 · 79e8cfc · 79e8cfc
1 parent 05163ff
commit 79e8cfc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3caeada948535f126e407457e15f2633ee7168a
+refs/heads/master: 84787e3fc38a4847e5d75388d5a7fb3cf6bd7834
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -1579,13 +1579,6 @@ 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 */