diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-11-06 14:45:40 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-11-10 04:25:14 -0500 |
commit | a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b (patch) | |
tree | 47ddc93180f6a1fc782965f376670ebb1b62c913 /drivers/net | |
parent | bdb3f751cfe6d8d5737a2ff406d7169361b5dfb2 (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/sky2.c | 3 |
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, | |||
3995 | dev->tx_timeout = sky2_tx_timeout; | 3995 | dev->tx_timeout = sky2_tx_timeout; |
3996 | dev->watchdog_timeo = TX_WATCHDOG; | 3996 | dev->watchdog_timeo = TX_WATCHDOG; |
3997 | #ifdef CONFIG_NET_POLL_CONTROLLER | 3997 | #ifdef CONFIG_NET_POLL_CONTROLLER |
3998 | dev->poll_controller = sky2_netpoll; | 3998 | if (port == 0) |
3999 | dev->poll_controller = sky2_netpoll; | ||
3999 | #endif | 4000 | #endif |
4000 | 4001 | ||
4001 | sky2 = netdev_priv(dev); | 4002 | sky2 = netdev_priv(dev); |