[syslinux:master] pxe: allow TFTP server IP to be empty when not using TFTP

[syslinux-bot for Michael Brown]

Commit-ID:  9126eb27d1d9597eb8751a5ef75c9bdcf4e429a6
Gitweb:     http://syslinux.zytor.com/commit/9126eb27d1d9597eb8751a5ef75c9bdcf4e429a6
Author:     Michael Brown <mcb30 at ipxe.org>
AuthorDate: Mon, 28 Mar 2011 20:44:17 +0100
Committer:  Michael Brown <mcb30 at ipxe.org>
CommitDate: Mon, 28 Mar 2011 20:47:10 +0100

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

Reported-by: Marcus Grando <Marcus.Grando at corp.terra.com.br>
Signed-off-by: Michael Brown <mcb30 at ipxe.org>


---
 core/fs/pxe/pxe.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
index aef2e7e..12bbdad 100644
--- 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: