summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-09-05 10:38:31 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-09-05 10:38:31 +0200
commite147a7e2bbc046c9b74d1d67ee5ae1aed0167f48 (patch)
tree0c88f1175957abc5f7a6483ddeb9214725df45ff /fs
parent980e793bd5411f22c89956cc0c7306507aed39e5 (diff)
parente6b4e599b7e68b073a46e290cf089a058a1262b7 (diff)
downloadbarebox-e147a7e2bbc046c9b74d1d67ee5ae1aed0167f48.tar.gz
barebox-e147a7e2bbc046c9b74d1d67ee5ae1aed0167f48.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'fs')
-rw-r--r--fs/tftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/tftp.c b/fs/tftp.c
index 50efe0d77c..b641faf15a 100644
--- a/fs/tftp.c
+++ b/fs/tftp.c
@@ -40,7 +40,7 @@
#define TFTP_RESEND_TIMEOUT SECOND
/* After this time without progress we will bail out */
-#define TFTP_TIMEOUT (5 * SECOND)
+#define TFTP_TIMEOUT (TIMEOUT * SECOND)
/*
* TFTP operations.