Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index f0f7a6c..3dcf20b 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -54,7 +54,7 @@
 #define RFC1001_PORT 139
 
 /* SMB echo "timeout" -- FIXME: tunable? */
 #define RFC1001_PORT 139
 
 /* SMB echo "timeout" -- FIXME: tunable? */

-#define SMB_ECHO_INTERVAL (60 * HZ)
+#define SMB_ECHO_INTERVAL (6 * HZ)

 
 extern mempool_t *cifs_req_poolp;
 
 
 extern mempool_t *cifs_req_poolp;