From 31d0e29568031d087b4684f875cac09b878ae8ae Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 30 Aug 2022 09:38:00 +0200 Subject: tftp: assign 'priv->block' later in WRQ Some refactoring; makes next patches cleaner. Signed-off-by: Enrico Scholz Link: https://lore.barebox.org/20220830073816.2694734-6-enrico.scholz@sigma-chemnitz.de Signed-off-by: Sascha Hauer --- fs/tftp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fs') diff --git a/fs/tftp.c b/fs/tftp.c index 361661d218..c1a1937117 100644 --- a/fs/tftp.c +++ b/fs/tftp.c @@ -254,6 +254,7 @@ static void tftp_recv(struct file_priv *priv, uint8_t *pkt, unsigned len, uint16_t uh_sport) { uint16_t opcode; + uint16_t block; /* according to RFC1350 minimal tftp packet length is 4 bytes */ if (len < 4) @@ -276,14 +277,13 @@ static void tftp_recv(struct file_priv *priv, if (!priv->push) break; - priv->block = ntohs(*(uint16_t *)pkt); - if (priv->block != priv->last_block) { - pr_vdebug("ack %d != %d\n", priv->block, priv->last_block); + block = ntohs(*(uint16_t *)pkt); + if (block != priv->last_block) { + pr_vdebug("ack %d != %d\n", block, priv->last_block); break; } - priv->block++; - + priv->block = block + 1; tftp_timer_reset(priv); if (priv->state == STATE_LAST) { -- cgit v1.2.1