aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/socket.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-02-01 15:16:53 -0500
committerSteve French <sfrench@us.ibm.com>2006-02-01 15:16:53 -0500
commite6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch)
treed9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /net/sctp/socket.c
parent1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff)
parent3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r--net/sctp/socket.c2
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
5428do_error: 5428do_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;