diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-10-14 14:31:47 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-10-14 14:31:47 +0200 |
| commit | 95df6f4ebaaa3972e312be1acf7650a18b84bf3d (patch) | |
| tree | ee69b8872cf8c295a48244280c82d98e191111ab /net | |
| parent | b49c90df6e7cfcfb8b862b8bbf8448dff5eed9a5 (diff) | |
| parent | b90c045f035c3cc9b5d2edaed6048dfb74e40763 (diff) | |
| download | blackbird-obmc-uboot-95df6f4ebaaa3972e312be1acf7650a18b84bf3d.tar.gz blackbird-obmc-uboot-95df6f4ebaaa3972e312be1acf7650a18b84bf3d.zip | |
Merge ../master/
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 2 | ||||
| -rw-r--r-- | net/net.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bootp.c b/net/bootp.c index be1ee332a5..749d3e5e0c 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -730,7 +730,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) break; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) case 2: /* Time offset */ - NetCopyLong (&NetTimeOffset, (ulong *) (popt + 2)); + NetCopyLong ((ulong *)&NetTimeOffset, (ulong *) (popt + 2)); NetTimeOffset = ntohl (NetTimeOffset); break; #endif @@ -541,11 +541,11 @@ restart: case NETLOOP_SUCCESS: if (NetBootFileXferSize > 0) { - char buf[10]; + char buf[20]; printf("Bytes transferred = %ld (%lx hex)\n", NetBootFileXferSize, NetBootFileXferSize); - sprintf(buf, "%lx", NetBootFileXferSize); + sprintf(buf, "%lX", NetBootFileXferSize); setenv("filesize", buf); sprintf(buf, "%lX", (unsigned long)load_addr); |
