summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-06-24 13:00:25 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-06-24 13:29:52 +0200
commitecf38bff9bdbfbd6d42ed7d08cbb86b7b2558241 (patch)
treec9a41b5fabadf7da69db5a00233fdc15e92744d5 /fs
parentb62cf8f36d5b71c8328841841f55599553fa8f26 (diff)
downloadbarebox-ecf38bff9bdbfbd6d42ed7d08cbb86b7b2558241.tar.gz
barebox-ecf38bff9bdbfbd6d42ed7d08cbb86b7b2558241.tar.xz
fs tftp: Fix short file transfers
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/tftp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/tftp.c b/fs/tftp.c
index e8a209e20f..6586270e35 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;
}