sky2: remove dual port workaround

84787e3f · Stephen Hemminger <[email protected]> · 2007-05-14 12:38:14 -07:00

This workaround was added to deal with NAPI core and how
it affected dual port shared polling. It turned out not to
be necessary. Stopping device 0 only doesn't stop NAPI from
working completely after that.

Signed-off-by: Stephen Hemminger <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>

Commit: 84787e3fc38a4847e5d75388d5a7fb3cf6bd7834
Parents: a3caeada

Changes

1 files changed · +0 −7

File	Status	Add	Del	Content
drivers/net/sky2.c	modified	+0	−7	View file

drivers/net/sky2.c

View file

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6e360f8..ccbd8c2 100644
--- a/drivers/net/sky2.c
+++ b/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 */