From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] tftp: trivial code simplification
Date: Fri, 3 Mar 2017 07:15:25 +0100 [thread overview]
Message-ID: <20170303061525.vio7e2attbv4ywuy@pengutronix.de> (raw)
In-Reply-To: <20170302160136.20616-1-u.kleine-koenig@pengutronix.de>
On Thu, Mar 02, 2017 at 05:01:36PM +0100, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> fs/tftp.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/fs/tftp.c b/fs/tftp.c
> index 272a7106eb51..bc3580289286 100644
> --- a/fs/tftp.c
> +++ b/fs/tftp.c
> @@ -568,13 +568,11 @@ static int tftp_read(struct device_d *dev, FILE *f, void *buf, size_t insize)
>
> while (insize) {
> now = kfifo_get(priv->fifo, buf, insize);
> + outsize += now;
> + buf += now;
> + insize -= now;
> if (priv->state == STATE_DONE)
> - return outsize + now;
> - if (now) {
> - outsize += now;
> - buf += now;
> - insize -= now;
> - }
> + return outsize;
>
> if (TFTP_FIFO_SIZE - kfifo_len(priv->fifo) >= priv->blocksize)
> tftp_send(priv);
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2017-03-03 6:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-02 16:01 Uwe Kleine-König
2017-03-03 6:15 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170303061525.vio7e2attbv4ywuy@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox