1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 397537bb4448..ce1a91618677 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -2867,16 +2867,9 @@ static void bnx2x_self_test(struct net_device *dev,
 
         memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS(bp));
 
-        if (bnx2x_test_nvram(bp) != 0) {
-                if (!IS_MF(bp))
-                        buf[4] = 1;
-                else
-                        buf[0] = 1;
-                etest->flags |= ETH_TEST_FL_FAILED;
-        }
-
         if (!netif_running(dev)) {
-                DP(BNX2X_MSG_ETHTOOL, "Interface is down\n");
+                DP(BNX2X_MSG_ETHTOOL,
+                   "Can't perform self-test when interface is down\n");
                 return;
         }
 
@@ -2938,7 +2931,13 @@ static void bnx2x_self_test(struct net_device *dev,
                 /* wait until link state is restored */
                 bnx2x_wait_for_link(bp, link_up, is_serdes);
         }
-
+        if (bnx2x_test_nvram(bp) != 0) {
+                if (!IS_MF(bp))
+                        buf[4] = 1;
+                else
+                        buf[0] = 1;
+                etest->flags |= ETH_TEST_FL_FAILED;
+        }
         if (bnx2x_test_intr(bp) != 0) {
                 if (!IS_MF(bp))
                         buf[5] = 1;