From fbe8f642b9d0e023ca66c815cf86644106f772ae Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Fri, 14 Sep 2012 09:50:17 +0200 Subject: net: tftp: timeout only after a proper amount of time Currently, the timeout when waiting for packages is smaller than the timeout communicated to the TFTP server for retransmitting. Make sure we wait at least for two retransmissions before giving up. Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer --- net/tftp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index ca12638353..053b8f3cd3 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -354,7 +354,8 @@ static int do_tftpb(int argc, char *argv[]) tftp_retries++; } - if (tftp_retries > PKT_NUM_RETRIES) { + /* Wait for two TIMEOUT periods and add some */ + if (tftp_retries > 2 * TIMEOUT + 1) { tftp_err = -ETIMEDOUT; break; } -- cgit v1.2.3