diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-09-30 13:22:36 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-09-30 13:33:26 +0100 |
commit | 47179ebc03dcb3177312d97cd912605704c40686 (patch) | |
tree | e766d15f3153fcabfccbb5e4a6e318d6c7c50478 /core/fs/pxe/pxe.c | |
parent | 3e86c0e35b96fef58dbfbb96e3ef509ea4047d2e (diff) | |
parent | 2fe3a7bdd20d6fada21bd455a902c2b02f46a02d (diff) | |
download | syslinux-47179ebc03dcb3177312d97cd912605704c40686.tar.gz |
Merge branch 'elflink-pxe-fixes-for-mfleming-2' of git://github.com/geneC/syslinux into firmware
Pull various network stack fixes from Gene Cumm and adapt to the 6.xx
core_udp_* API,
* 'elflink-pxe-fixes-for-mfleming-2' of git://github.com/geneC/syslinux:
PXE ISR: Force polling on select hardware WORKAROUND
core/lwip: Fix NULL pointer check
PXE: use ddprintf macro
com32: Define ddprintf() macro
PXELINUX: specify PXE/lwIP
undiif: show thread of execution on UNDIIF_ID_DEBUG
core: dprintf() the banner.
PXELINUX: Use sendto() instead of connect()/send()/disconnect()
core: make mbox_post()/__sem_down_slow() check if valid
core: mbox/semaphore NULL checks
core/lwip/undi: Improve UNDIIF_ID_DEBUG messages
Conflicts:
core/fs/pxe/pxe.c
core/fs/pxe/tftp.c
core/init.c
Diffstat (limited to 'core/fs/pxe/pxe.c')
-rw-r--r-- | 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 4591edc9..4de4dbfb 100644 --- a/core/fs/pxe/pxe.c +++ b/core/fs/pxe/pxe.c @@ -371,7 +371,7 @@ static void get_prefix(void) *(p + 2) = 0; /* Zero-terminate after delimiter */ } - printf("TFTP prefix: %s\n", path_prefix); + ddprintf("TFTP prefix: %s\n", path_prefix); if (url_type(path_prefix) == URL_SUFFIX) { /* @@ -476,7 +476,7 @@ static int pxe_open_config(struct com32_filedata *filedata) if (open_file(ConfigName, O_RDONLY, filedata) >= 0) return 0; - printf("%-68s\n", "Unable to locate configuration file"); + ddprintf("%-68s\n", "Unable to locate configuration file"); kaboom(); } @@ -532,7 +532,7 @@ static void ip_init(void) gendotquad(dot_quad_buf, ip); ip = ntohl(ip); - printf("My IP address seems to be %08X %s\n", ip, dot_quad_buf); + ddprintf("My IP address seems to be %08X %s\n", ip, dot_quad_buf); } /* |