aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-11-06 11:45:40 -0800
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:14 -0500
commita5e68c02fe4d8dff2ff3c5212f9f67082849cc4b (patch)
tree47ddc93180f6a1fc782965f376670ebb1b62c913
parentb43: Fix kconfig dependencies for rfkill and leds (diff)
downloadlinux-dev-a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b.tar.xz
linux-dev-a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b.zip
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>
-rw-r--r--drivers/net/sky2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 94de85f3c720..4666e6e20972 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);