Merge branch 'origin/master' (early part)

1 files changed, 4 insertions, 2 deletions

diff --git a/networking/tftp.c b/networking/tftp.c
index ab4e25967..43ae13647 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -24,7 +24,8 @@
 
 #define TFTP_BLKSIZE_DEFAULT       512  /* according to RFC 1350, don't change */
 #define TFTP_BLKSIZE_DEFAULT_STR "512"
-#define TFTP_TIMEOUT_MS             50
+/* Was 50 ms but users asked to bump it up a bit */
+#define TFTP_TIMEOUT_MS            100
 #define TFTP_MAXTIMEOUT_MS        2000
 #define TFTP_NUM_RETRIES            12  /* number of backed-off retries */
 
@@ -582,7 +583,8 @@ static int tftp_protocol(
                          * "An option not acknowledged by the server
                          * must be ignored by the client and server
                          * as if it were never requested." */
-                        bb_error_msg("server only supports blocksize of 512");
+                        if (blksize != TFTP_BLKSIZE_DEFAULT)
+                                bb_error_msg("falling back to blocksize "TFTP_BLKSIZE_DEFAULT_STR);
                         blksize = TFTP_BLKSIZE_DEFAULT;
                         io_bufsize = TFTP_BLKSIZE_DEFAULT + 4;
                 }