mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] fs tftp: Fix short file transfers
Date: Sun, 24 Jun 2012 13:30:11 +0200	[thread overview]
Message-ID: <1340537411-22868-1-git-send-email-s.hauer@pengutronix.de> (raw)

With files smaller than the tftp block size the whole transfer is done
in tftp_do_open already. In this case we are in STATE_DONE, but there
is no error. Set priv->err to 0 and check for it to be able to transfer
small files.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 fs/tftp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/tftp.c b/fs/tftp.c
index e8a209e..6586270 100644
--- a/fs/tftp.c
+++ b/fs/tftp.c
@@ -336,6 +336,7 @@ static void tftp_handler(void *ctx, char *packet, unsigned len)
 
 		if (len < priv->blocksize) {
 			tftp_send(priv);
+			priv->err = 0;
 			priv->state = STATE_DONE;
 		}
 
@@ -423,7 +424,7 @@ static struct file_priv *tftp_do_open(struct device_d *dev,
 			goto out2;
 	}
 
-	if (priv->state == STATE_DONE) {
+	if (priv->state == STATE_DONE && priv->err) {
 		ret = priv->err;
 		goto out2;
 	}
-- 
1.7.10


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

                 reply	other threads:[~2012-06-24 11:30 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1340537411-22868-1-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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