From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Tue, 6 Nov 2007 19:45:40 +0000 (-0800)
Subject: sky2: netpoll on port 0 only
X-Git-Tag: v2.6.24-rc3~163^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b;p=linux-2.6

sky2: netpoll on port 0 only

Netpoll will only work on port 0 because of the restrictive
relationship between NAPI and netpoll.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 94de85f3c7..4666e6e209 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3995,7 +3995,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 	dev->tx_timeout = sky2_tx_timeout;
 	dev->watchdog_timeo = TX_WATCHDOG;
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	dev->poll_controller = sky2_netpoll;
+	if (port == 0)
+		dev->poll_controller = sky2_netpoll;
 #endif
 
 	sky2 = netdev_priv(dev);