V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

net: Revert "tftp: adjust settings to be suitable for 100Mbit ethernet" 

Commit 620776d "tftp: adjust settings to be suitable for 100Mbit ethernet"
causes the following error message when trying to load a file using 'tftp'
command via a tftp server.

    TFTP error: 'Unsupported option(s) requested' (8)

This is due to with commit 620776d changes, the tftp option 'timeout'
value is now set to zero which is an invalid value as per RFC2349 [1].
Valid values range between "1" and "255" seconds, inclusive. With some
tftp servers that strictly implement the RFC requirement, it reports
such an error message.

Revert commit 620776d for RFC compliance.

[1] https://www.ietf.org/rfc/rfc2349.txt

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Bin Meng 2015-08-27 22:25:51 -07:00 committed by Simon Glass
parent 548fb8777d
commit af2ca59e63
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tftp.c
View File

@ -19,10 +19,10 @@
/* Well known TFTP port # */ /* Well known TFTP port # */
#define WELL_KNOWN_PORT 69 #define WELL_KNOWN_PORT 69
/* Millisecs to timeout for lost pkt */ /* Millisecs to timeout for lost pkt */
#define TIMEOUT 100UL #define TIMEOUT 5000UL
#ifndef CONFIG_NET_RETRY_COUNT #ifndef CONFIG_NET_RETRY_COUNT
/* # of timeouts before giving up */ /* # of timeouts before giving up */
# define TIMEOUT_COUNT 1000 # define TIMEOUT_COUNT 10
#else #else
# define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT * 2) # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT * 2)
#endif #endif
@ -711,10 +711,10 @@ void tftp_start(enum proto_t protocol)
if (ep != NULL) if (ep != NULL)
timeout_ms = simple_strtol(ep, NULL, 10); timeout_ms = simple_strtol(ep, NULL, 10);
if (timeout_ms < 10) { if (timeout_ms < 1000) {
printf("TFTP timeout (%ld ms) too low, set min = 10 ms\n", printf("TFTP timeout (%ld ms) too low, set min = 1000 ms\n",
timeout_ms); timeout_ms);
timeout_ms = 10; timeout_ms = 1000;
} }
debug("TFTP blocksize = %i, timeout = %ld ms\n", debug("TFTP blocksize = %i, timeout = %ld ms\n",