[PATCH] sky2: netpoll on dual port cards

[PATCH] sky2: netpoll on dual port cards

[Stephen Hemminger]

The sky2 driver uses a single NAPI poll routine for both ports on dual ported
cards (because there is a single IRQ and status ring). Netpoll makes assumptions
about the relationship between network device and NAPI that aren't correct
on the second port, this will cause the port to never clear work.

Most systems, just have single port, so not a big issue.
The easy fix is just make the second port, not netpoll capable.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

--- sky2.orig/drivers/net/sky2.c	2006-10-18 13:25:22.000000000 -0700
+++ sky2/drivers/net/sky2.c	2006-10-18 13:27:06.000000000 -0700
@@ -3255,7 +3255,11 @@
 		dev->poll = sky2_poll;
 	dev->weight = NAPI_WEIGHT;
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = sky2_netpoll;
+	/* Network console (only works on port 0)
+	 * because netpoll makes assumptions about NAPI
+	 */
+	if (port == 0)
+		dev->poll_controller = sky2_netpoll;
 #endif
 
 	sky2 = netdev_priv(dev);

Re: [PATCH] sky2: netpoll on dual port cards

[Jeff Garzik]

Stephen Hemminger wrote:
> The sky2 driver uses a single NAPI poll routine for both ports on dual ported
> cards (because there is a single IRQ and status ring). Netpoll makes assumptions
> about the relationship between network device and NAPI that aren't correct
> on the second port, this will cause the port to never clear work.
> 
> Most systems, just have single port, so not a big issue.
> The easy fix is just make the second port, not netpoll capable.
> 
> Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

applied to #upstream-fixes