diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2006-06-17 22:56:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-17 22:56:08 -0700 |
| commit | 4c9f5d5305a23851e67471b147e0d459a7166717 (patch) | |
| tree | 6cacecfa0b61248b996dfe54d1f944c5bab32d6d | |
| parent | 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 (diff) | |
| download | linux-4c9f5d5305a23851e67471b147e0d459a7166717.tar.gz linux-4c9f5d5305a23851e67471b147e0d459a7166717.tar.bz2 linux-4c9f5d5305a23851e67471b147e0d459a7166717.zip | |
[SCTP] Reset rtt_in_progress for the chunk when processing its sack.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/sctp.h | 2 | ||||
| -rw-r--r-- | net/sctp/outqueue.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index aa6033ca7cd8..b2b40f951ae6 100644 --- a/include/net/sctp/sctp.h +++ b/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/net/sctp/outqueue.c b/net/sctp/outqueue.c index f148f9576dd2..e5faa351aaad 100644 --- a/net/sctp/outqueue.c +++ b/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); |