This driver uses port 0 to handle receives on both ports. So
the netif_poll_disable call in dev_close would end up stopping the
second port on dual port cards.

Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>

---
 drivers/net/sky2.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- linux-2.6.16.40.orig/drivers/net/sky2.c     2007-02-21 15:57:56.000000000 
-0800
+++ linux-2.6.16.40/drivers/net/sky2.c  2007-02-21 15:58:02.000000000 -0800
@@ -1402,6 +1402,13 @@
        /* Stop more packets from being queued */
        netif_stop_queue(dev);
 
+       /*
+        * 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);
+
        /* Disable port IRQ */
        spin_lock_irq(&hw->hw_lock);
        hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2);

--
Stephen Hemminger <[EMAIL PROTECTED]>

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to