Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work

into nuts.davemloft.net:/disk1/BK/net-2.6

Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
into nuts.davemloft.net:/disk1/BK/net-2.6
844d1b9f · David S. Miller · f2f4031d · 08027d01 · 844d1b9f
Commit 844d1b9f authored Feb 26, 2004 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

net/sctp/sm_statefuns.c net/sctp/sm_statefuns.c +1 -2

No files found.
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -4272,8 +4272,7 @@ sctp_disposition_t sctp_sf_t1_timer_expire(const struct sctp_endpoint *ep,
 	SCTP_DEBUG_PRINTK("Timer T1 expired.\n");
-	if ((timeout < asoc->max_init_timeo) &&
+	if (attempts < asoc->max_init_attempts) {
-	    (attempts < asoc->max_init_attempts)) {
 		switch (timer) {
 		case SCTP_EVENT_TIMEOUT_T1_INIT:
 			bp = (struct sctp_bind_addr *) &asoc->base.bind_addr;