]> err.no Git - linux-2.6/commitdiff
sky2: netpoll on port 0 only
authorStephen Hemminger <shemminger@linux-foundation.org>
Tue, 6 Nov 2007 19:45:40 +0000 (11:45 -0800)
committerJeff Garzik <jeff@garzik.org>
Sat, 10 Nov 2007 09:25:14 +0000 (04:25 -0500)
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>
drivers/net/sky2.c

index 94de85f3c72076cee1dddbbc613c26aa97150fba..4666e6e20972f48e52e96967bb793b348237ea70 100644 (file)
@@ -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);