diff options
| author | Tom Rini <trini@ti.com> | 2012-12-17 18:39:50 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-12-17 18:39:50 -0700 |
| commit | 095728803eedfce850a2f85828f79500cb09979e (patch) | |
| tree | c226054297c0d3c82b112f1e45af121214b30a87 /net | |
| parent | e80e588bb8db254fd939f83116ccf901bd233066 (diff) | |
| parent | e3bb3254f8c055767edd1f02e642bec386540f4c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'net')
| -rw-r--r-- | net/link_local.c | 2 | ||||
| -rw-r--r-- | net/tftp.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/net/link_local.c b/net/link_local.c index d52f13adb4..1ba796ebdf 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -103,7 +103,7 @@ static void configure_wait(void) void link_local_start(void) { ip = getenv_IPaddr("llipaddr"); - if (ip != 0 && (ip & IN_CLASSB_NET) != LINKLOCAL_ADDR) { + if (ip != 0 && (ntohl(ip) & IN_CLASSB_NET) != LINKLOCAL_ADDR) { puts("invalid link address"); net_set_state(NETLOOP_FAIL); return; diff --git a/net/tftp.c b/net/tftp.c index 59a8ebb3cf..09790eb7cf 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -40,6 +40,7 @@ static ulong TftpTimeoutMSecs = TIMEOUT; static int TftpTimeoutCountMax = TIMEOUT_COUNT; +static ulong time_start; /* Record time we started tftp */ /* * These globals govern the timeout behavior when attempting a connection to a @@ -299,6 +300,12 @@ static void tftp_complete(void) TftpNumchars++; } #endif + time_start = get_timer(time_start); + if (time_start > 0) { + puts("\n\t "); /* Line up with "Loading: " */ + print_size(NetBootFileXferSize / + time_start * 1000, "/s"); + } puts("\ndone\n"); net_set_state(NETLOOP_SUCCESS); } @@ -775,6 +782,7 @@ void TftpStart(enum proto_t protocol) TftpState = STATE_SEND_RRQ; } + time_start = get_timer(0); TftpTimeoutCountMax = TftpRRQTimeoutCountMax; NetSetTimeout(TftpTimeoutMSecs, TftpTimeout); |