Commit 25d82d7a authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

sky2: dual port NAPI problem 



Shutting down port 0 disables the NAPI poll used by both ports.
The long term fix will be to separate NAPI object from net device
until then just reenable if needed.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ce9f7fe3

drivers/net/sky2.c

+7 −0
Original line number Diff line number Diff line
@@ -1511,6 +1511,13 @@ 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 */