summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuyuki Kobayashi <koba@kmckk.co.jp>2012-07-03 22:25:21 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-07-12 14:13:24 -0500
commit48a3e999c86e7e6033133152b07a308def559d46 (patch)
treea6da0711345b1c0b0ad232c57ac8a9b378a990ee
parent0878222fed3fafbfd0b1f2e5a6b2da90a81e910d (diff)
downloadblackbird-obmc-uboot-48a3e999c86e7e6033133152b07a308def559d46.tar.gz
blackbird-obmc-uboot-48a3e999c86e7e6033133152b07a308def559d46.zip
net: nfs: make NFS_TIMEOUT configurable
NFS_TIMEOUT is constant value defined in net/nfs.c. But sometimes it needs to adjust. This patch enables to override NFS_TIMEOUT by defining CONFIG_NFS_TIMEOUT in a board specific config file. Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
-rw-r--r--README7
-rw-r--r--net/nfs.c6
2 files changed, 12 insertions, 1 deletions
diff --git a/README b/README
index dac46f35b2..fb9d904a2e 100644
--- a/README
+++ b/README
@@ -2149,6 +2149,13 @@ The following options need to be configured:
Timeout waiting for an ARP reply in milliseconds.
+ CONFIG_NFS_TIMEOUT
+
+ Timeout in milliseconds used in NFS protocol.
+ If you encounter "ERROR: Cannot umount" in nfs command,
+ try longer timeout such as
+ #define CONFIG_NFS_TIMEOUT 10000UL
+
- Command Interpreter:
CONFIG_AUTO_COMPLETE
diff --git a/net/nfs.c b/net/nfs.c
index 5b9976354c..7f2393f606 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -31,7 +31,11 @@
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_RETRY_COUNT 30
-#define NFS_TIMEOUT 2000UL
+#ifndef CONFIG_NFS_TIMEOUT
+# define NFS_TIMEOUT 2000UL
+#else
+# define NFS_TIMEOUT CONFIG_NFS_TIMEOUT
+#endif
static int fs_mounted;
static unsigned long rpc_id;
OpenPOWER on IntegriCloud