pxe: allow TFTP server IP to be empty when not using TFTP

Reported-by: Marcus Grando <Marcus.Grando@corp.terra.com.br> Signed-off-by: Michael Brown <mcb30@ipxe.org>
mcb30 · Mar 28, 2011 · 9126eb2 · 9126eb2
1 parent 239fed5
commit 9126eb2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
@@ -754,9 +754,6 @@ static void __pxe_searchdir(const char *filename, struct file *file)
 	break;
     }
 
-    if (!ip)
-	return;			/* No server */
-
     buf++;			/* Point *past* the final NULL */
     memcpy(buf, rrq_tail, sizeof rrq_tail);
     buf += sizeof rrq_tail;
@@ -792,6 +789,9 @@ static void __pxe_searchdir(const char *filename, struct file *file)
     }
 #endif /* GPXE */
 
+    if (!ip)
+	    goto done;		/* No server */
+
     timeout_ptr = TimeoutTable;   /* Reset timeout */
 
 sendreq: