diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 13:21:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 13:21:13 -0500 |
| commit | 7fcdf327bedfe9cc418af49429d0fc0e48d98de9 (patch) | |
| tree | 4dd9ab338b1641318b1251cc0522c22f14137e4b /net/sctp/socket.c | |
| parent | f7dd16bf3a2e7e29670051a2488d4be1895e408d (diff) | |
| parent | 2c74088e4104a2a82bd773f79ae0344c22eceb8c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index fb1821d9f338..0ea947eb6813 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -5426,7 +5426,7 @@ out: | |||
| 5426 | return err; | 5426 | return err; |
| 5427 | 5427 | ||
| 5428 | do_error: | 5428 | do_error: |
| 5429 | if (asoc->init_err_counter + 1 >= asoc->max_init_attempts) | 5429 | if (asoc->init_err_counter + 1 > asoc->max_init_attempts) |
| 5430 | err = -ETIMEDOUT; | 5430 | err = -ETIMEDOUT; |
| 5431 | else | 5431 | else |
| 5432 | err = -ECONNREFUSED; | 5432 | err = -ECONNREFUSED; |