diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-08-05 17:17:05 +0200 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-08-12 14:15:28 -0500 |
| commit | 7628afebe9685a333e0a42398ed8be749a1fef0d (patch) | |
| tree | 5fbbee9408059beb3ef8c15d4924d445161f4bba /net | |
| parent | 1b564cecc358ccd08691c879fca95c2075fcb702 (diff) | |
| download | talos-obmc-uboot-7628afebe9685a333e0a42398ed8be749a1fef0d.tar.gz talos-obmc-uboot-7628afebe9685a333e0a42398ed8be749a1fef0d.zip | |
tftp.c: fix CONFIG_TFTP_TSIZE for small files
CONFIG_TFTP_TSIZE should limit a tftp downloads progress to 50 '#'
chars. Make this work also for small files.
If the file size is small, i.e. smaller than 2 tftp block sizes the
number of '#' can get much larger. i.e. with a 1 byte file 65000
characters are printed, with a 512 byte file around 500.
When using CONFIG TFTP BLOCKSIZE together with CONFIG_IP_DEFRAG the
issue is more notable.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tftp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tftp.c b/net/tftp.c index 3e99e73091..89be32a26b 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -249,6 +249,8 @@ static void show_block_marker(void) if (tftp_tsize) { ulong pos = tftp_cur_block * tftp_block_size + tftp_block_wrap_offset; + if (pos > tftp_tsize) + pos = tftp_tsize; while (tftp_tsize_num_hash < pos * 50 / tftp_tsize) { putc('#'); |
