From 331793a732fed039dc502e0dbda49cac25c0c0e3 Mon Sep 17 00:00:00 2001
From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Sat, 17 Jun 2006 22:56:08 -0700
Subject: [PATCH] --- yaml --- r: 27591 b: refs/heads/master c:
 4c9f5d5305a23851e67471b147e0d459a7166717 h: refs/heads/master i:   27589:
 2c57c90f27d42569a85e1fe0c06d60f1b5b5e977   27587:
 3557321214384962ecc78f40d6c8734872ace4ca   27583:
 2a31ae40876bec025d6a534177cde3d9c02fd737 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/sctp/sctp.h | 2 +-
 trunk/net/sctp/outqueue.c     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 52e09e08ea71..79093ef8e13d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5636bef7324f49e36f05ec8a5f6284e11b1bcca4
+refs/heads/master: 4c9f5d5305a23851e67471b147e0d459a7166717
diff --git a/trunk/include/net/sctp/sctp.h b/trunk/include/net/sctp/sctp.h
index aa6033ca7cd8..b2b40f951ae6 100644
--- a/trunk/include/net/sctp/sctp.h
+++ b/trunk/include/net/sctp/sctp.h
@@ -255,7 +255,7 @@ extern int sctp_debug_flag;
 #define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
 #define SCTP_ENABLE_DEBUG
 #define SCTP_DISABLE_DEBUG
-#define SCTP_ASSERT(expr, str, func)
+#define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr))
 
 #endif /* SCTP_DEBUG */
 
diff --git a/trunk/net/sctp/outqueue.c b/trunk/net/sctp/outqueue.c
index f148f9576dd2..e5faa351aaad 100644
--- a/trunk/net/sctp/outqueue.c
+++ b/trunk/net/sctp/outqueue.c
@@ -1262,6 +1262,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
 			   	if (!tchunk->tsn_gap_acked &&
 				    !tchunk->resent &&
 				    tchunk->rtt_in_progress) {
+					tchunk->rtt_in_progress = 0;
 					rtt = jiffies - tchunk->sent_at;
 					sctp_transport_update_rto(transport,
 								  rtt);