Correct the previous patch, we were doing the nicdelay on the wrong place. (#349521)

1 files changed, 10 insertions, 8 deletions

diff --git a/loader2/net.c b/loader2/net.c
index 693b641ba..0f806e860 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -168,13 +168,6 @@ static int waitForLink(char * dev) {
      * to five times */
     logMessage(DEBUGLVL, "waiting for link %s...", dev);
 
-    /* Networks with STP set up will give link when the port
-     * is isolated from the network, and won't forward packets
-     * until they decide we're not a switch. */
-    logMessage(DEBUGLVL, "sleep (nicdelay) for %d secs first", post_link_sleep);
-    sleep(post_link_sleep);
-    logMessage(DEBUGLVL, "continuing...");
-
     while (tries < num_link_checks) {
       if (get_link_status(dev) != 0)
             break;
@@ -182,8 +175,17 @@ static int waitForLink(char * dev) {
         tries++;
     }
     logMessage(DEBUGLVL, "   %d seconds.", tries);
-    if (tries < num_link_checks)
+    if (tries < num_link_checks){
+	/* Networks with STP set up will give link when the port
+	 * is isolated from the network, and won't forward packets
+	 * until they decide we're not a switch. */
+	logMessage(DEBUGLVL, "sleep (nicdelay) for %d secs first", post_link_sleep);
+	sleep(post_link_sleep);
+	logMessage(DEBUGLVL, "continuing...");
+
         return 0;
+    }
+
     logMessage(WARNING, "    no network link detected on %s", dev);
     return 1;
 }