Message ID | dea4cf42f328f1d26207b721908b5a54b2c78db0.1438641417.git.marcel.ziswiler@toradex.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
Hi Marcel, On Tue, Aug 4, 2015 at 1:58 AM, Marcel Ziswiler <marcel@ziswiler.com> wrote: > From: Max Krummenacher <max.krummenacher@toradex.com> > > 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>
diff --git a/net/tftp.c b/net/tftp.c index 3e99e73..89be32a 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('#');