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

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
...@@ -1511,6 +1511,13 @@ static int sky2_down(struct net_device *dev) ...@@ -1511,6 +1511,13 @@ static int sky2_down(struct net_device *dev)
imask &= ~portirq_msk[port]; imask &= ~portirq_msk[port];
sky2_write32(hw, B0_IMSK, imask); 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); sky2_gmac_reset(hw, port);
/* Stop transmitter */ /* Stop transmitter */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment