Adjust timouts and retry counts to be suitable for loaded ethernet network. With 5 seconds timeout, 10 retries maximum, tftp is impossible even on local network with single full-speed TCP connection.
100msec timeout should be suitable for most networks tftp is used on, that is local ethernets. Timeout count really needs to be way higher, as lost packets are normal when TCP is running over the same network.
Enforce 10msec minimum.
Signed-off-by: Pavel Machek pavel@denx.de
diff --git a/net/tftp.c b/net/tftp.c index 0a2c533..c5ea3f2 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -18,10 +18,10 @@ /* Well known TFTP port # */ #define WELL_KNOWN_PORT 69 /* Millisecs to timeout for lost pkt */ -#define TIMEOUT 5000UL +#define TIMEOUT 100UL #ifndef CONFIG_NET_RETRY_COUNT /* # of timeouts before giving up */ -# define TIMEOUT_COUNT 10 +# define TIMEOUT_COUNT 1000 #else # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT * 2) #endif @@ -703,11 +703,11 @@ void TftpStart(enum proto_t protocol) if (ep != NULL) TftpTimeoutMSecs = simple_strtol(ep, NULL, 10);
- if (TftpTimeoutMSecs < 1000) { + if (TftpTimeoutMSecs < 10) { printf("TFTP timeout (%ld ms) too low, " - "set minimum = 1000 ms\n", + "set minimum = 10 ms\n", TftpTimeoutMSecs); - TftpTimeoutMSecs = 1000; + TftpTimeoutMSecs = 10; }
debug("TFTP blocksize = %i, timeout = %ld ms\n",