From e56f777af82ebbdf8302164b040128d890f100d8 Mon Sep 17 00:00:00 2001 From: Marcelo Ricardo Leitner Date: Fri, 23 Jun 2017 19:59:34 -0300 Subject: [PATCH] sctp: allow increasing cwnd regardless of ctsn moving or not As per RFC4960 Errata 3.22, this condition is not needed anymore as it could cause the partial_bytes_acked to not consider the TSNs acked in the Gap Ack Blocks although they were received by the peer successfully. This patch thus drops the check for new Cumulative TSN Ack Point, leaving just the flight_size < cwnd one. See-also: https://tools.ietf.org/html/draft-ietf-tsvwg-rfc4960-errata-01#section-3.22 Signed-off-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller --- net/sctp/transport.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 04b6dd1a07de..9d3589451a96 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c @@ -406,11 +406,10 @@ void sctp_transport_raise_cwnd(struct sctp_transport *transport, asoc->fast_recovery = 0; /* The appropriate cwnd increase algorithm is performed if, and only - * if the cumulative TSN whould advanced and the congestion window is - * being fully utilized. + * if the congestion window is being fully utilized. + * Note that RFC4960 Errata 3.22 removed the other condition. */ - if (TSN_lte(sack_ctsn, transport->asoc->ctsn_ack_point) || - (flight_size < cwnd)) + if (flight_size < cwnd) return; ssthresh = transport->ssthresh; @@ -446,11 +445,11 @@ void sctp_transport_raise_cwnd(struct sctp_transport *transport, flight_size, pba); } else { /* RFC 2960 7.2.2 Whenever cwnd is greater than ssthresh, - * upon each SACK arrival that advances the Cumulative TSN Ack - * Point, increase partial_bytes_acked by the total number of - * bytes of all new chunks acknowledged in that SACK including - * chunks acknowledged by the new Cumulative TSN Ack and by - * Gap Ack Blocks. + * upon each SACK arrival, increase partial_bytes_acked + * by the total number of bytes of all new chunks + * acknowledged in that SACK including chunks + * acknowledged by the new Cumulative TSN Ack and by Gap + * Ack Blocks. (updated by RFC4960 Errata 3.22) * * When partial_bytes_acked is equal to or greater than * cwnd and before the arrival of the SACK the sender -- 2.20.1