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

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index fb1d2c30c1bb..4fb3db99bcd1 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -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 */