[PATCH] fs tftp: Fix short file transfers
Sascha Hauer
s.hauer at pengutronix.de
Sun Jun 24 07:30:11 EDT 2012
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 at 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
More information about the barebox
mailing list