From a82c8a8cbd5b90e68a03f88e93627f95b0840d19 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Thu, 1 Jul 2010 13:39:01 +0000 Subject: [PATCH] --- yaml --- r: 203345 b: refs/heads/master c: 8d420a1b3ea65357b6eb59e4e742248d2838e904 h: refs/heads/master i: 203343: 0bedc9eeea73b4b6bf0867daa8543f4c7e8b6baf v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_ethtool.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7b3930386cb1..6f192c62679e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0f2276f3601a96b29d4347c5938e9494e8e4e5d +refs/heads/master: 8d420a1b3ea65357b6eb59e4e742248d2838e904 diff --git a/trunk/drivers/net/igb/igb_ethtool.c b/trunk/drivers/net/igb/igb_ethtool.c index f2ebf927e4bc..26bf6a13d1c1 100644 --- a/trunk/drivers/net/igb/igb_ethtool.c +++ b/trunk/drivers/net/igb/igb_ethtool.c @@ -1823,12 +1823,10 @@ static void igb_diag_test(struct net_device *netdev, dev_info(&adapter->pdev->dev, "online testing starting\n"); /* PHY is powered down when interface is down */ - if (!netif_carrier_ok(netdev)) { + if (if_running && igb_link_test(adapter, &data[4])) + eth_test->flags |= ETH_TEST_FL_FAILED; + else data[4] = 0; - } else { - if (igb_link_test(adapter, &data[4])) - eth_test->flags |= ETH_TEST_FL_FAILED; - } /* Online tests aren't run; pass by default */ data[0] = 0;