attribute is not used outside tftp_recv() for RRQ. Signed-off-by: Enrico Scholz <enrico.scholz@xxxxxxxxxxxxxxxxx> --- fs/tftp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/tftp.c b/fs/tftp.c index 4c3980404dc1..c96c8917633a 100644 --- a/fs/tftp.c +++ b/fs/tftp.c @@ -316,6 +316,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) @@ -370,7 +371,7 @@ static void tftp_recv(struct file_priv *priv, case TFTP_DATA: len -= 2; - priv->block = ntohs(*(uint16_t *)pkt); + block = ntohs(*(uint16_t *)pkt); if (priv->state == STATE_RRQ || priv->state == STATE_OACK) { /* first block received */ @@ -378,20 +379,20 @@ static void tftp_recv(struct file_priv *priv, priv->tftp_con->udp->uh_dport = uh_sport; priv->last_block = 0; - if (priv->block != 1) { /* Assertion */ + if (block != 1) { /* Assertion */ pr_err("error: First block is not block 1 (%d)\n", - priv->block); + block); priv->err = -EINVAL; priv->state = STATE_DONE; break; } } - if (priv->block != (uint16_t)(priv->last_block + 1)) + if (block != (uint16_t)(priv->last_block + 1)) break; tftp_timer_reset(priv); - tftp_put_data(priv, priv->block, pkt + 2, len); + tftp_put_data(priv, block, pkt + 2, len); break; -- 2.37.1