diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /fs/ncpfs/sock.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'fs/ncpfs/sock.c')
| -rw-r--r-- | fs/ncpfs/sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index 33a4293c4..3f36db262 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c @@ -203,7 +203,8 @@ static int do_ncp_rpc_call(struct ncp_server *server, int size, } n = 0; timeout = init_timeout; - init_timeout <<= 1; + if (init_timeout < max_timeout) + init_timeout <<= 1; if (!major_timeout_seen) { printk(KERN_WARNING "NCP server not responding\n"); } |