From: Stephen Hemminger Date: Mon, 14 May 2007 19:38:14 +0000 (-0700) Subject: sky2: remove dual port workaround X-Git-Tag: v3.12-rc1~29457 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84787e3fc38a4847e5d75388d5a7fb3cf6bd7834;p=kernel%2Fkernel-generic.git sky2: remove dual port workaround 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 Signed-off-by: Jeff Garzik --- 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 */