diff options
| author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2022-08-30 09:38:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-31 08:31:21 +0200 |
| commit | 31d0e29568031d087b4684f875cac09b878ae8ae (patch) | |
| tree | 8a012af1c2c43d322b17fa51ebf64177639b4844 | |
| parent | 0e12f6eb1b3e6c6e447586c0b72edf1663c0ae96 (diff) | |
| download | barebox-31d0e29568031d087b4684f875cac09b878ae8ae.tar.gz barebox-31d0e29568031d087b4684f875cac09b878ae8ae.tar.xz | |
tftp: assign 'priv->block' later in WRQ
Some refactoring; makes next patches cleaner.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Link: https://lore.barebox.org/20220830073816.2694734-6-enrico.scholz@sigma-chemnitz.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | fs/tftp.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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) { |