From f1377ccaad6a5fe0a9b41be19ba23191e70db852 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 6 Nov 2007 11:45:40 -0800 Subject: [PATCH] --- yaml --- r: 73459 b: refs/heads/master c: a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b h: refs/heads/master i: 73457: a8fff502820d552eebe458f494db551674c8eb2b 73455: 62dfd65303ac7a30c4dad7242d500ca175344684 v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 94718caecd6f..acdea05cebd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdb3f751cfe6d8d5737a2ff406d7169361b5dfb2 +refs/heads/master: a5e68c02fe4d8dff2ff3c5212f9f67082849cc4b diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 94de85f3c720..4666e6e20972 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/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);