From 79e8cfc9450db293fc73b5663693d36198b09cfc Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 14 May 2007 12:38:14 -0700
Subject: [PATCH] --- yaml --- r: 56545 b: refs/heads/master c:
 84787e3fc38a4847e5d75388d5a7fb3cf6bd7834 h: refs/heads/master i:   56543:
 dbfa825376f29dfaab83b1b37b2589e5bf3dc9d1 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 59a7eb1e8433..c8b1a6f7dd61 100644
--- 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
index 6e360f816605..ccbd8c2674b0 100644
--- 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 */