Commit 84787e3f authored May 14, 2007 by Stephen Hemminger Committed by Jeff Garzik May 17, 2007

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 <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent a3caeada

drivers/net/sky2.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message