aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ccids')
-rw-r--r--net/dccp/ccids/ccid2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index b9c942a09c98..dc18172b1e59 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -325,8 +325,9 @@ static void ccid2_rtt_estimator(struct sock *sk, const long mrtt)
325 hc->tx_srtt = m << 3; 325 hc->tx_srtt = m << 3;
326 hc->tx_mdev = m << 1; 326 hc->tx_mdev = m << 1;
327 327
328 hc->tx_mdev_max = max(TCP_RTO_MIN, hc->tx_mdev); 328 hc->tx_mdev_max = max(hc->tx_mdev, tcp_rto_min(sk));
329 hc->tx_rttvar = hc->tx_mdev_max; 329 hc->tx_rttvar = hc->tx_mdev_max;
330
330 hc->tx_rtt_seq = dccp_sk(sk)->dccps_gss; 331 hc->tx_rtt_seq = dccp_sk(sk)->dccps_gss;
331 } else { 332 } else {
332 /* Update scaled SRTT as SRTT += 1/8 * (m - SRTT) */ 333 /* Update scaled SRTT as SRTT += 1/8 * (m - SRTT) */
@@ -367,7 +368,7 @@ static void ccid2_rtt_estimator(struct sock *sk, const long mrtt)
367 hc->tx_rttvar -= (hc->tx_rttvar - 368 hc->tx_rttvar -= (hc->tx_rttvar -
368 hc->tx_mdev_max) >> 2; 369 hc->tx_mdev_max) >> 2;
369 hc->tx_rtt_seq = dccp_sk(sk)->dccps_gss; 370 hc->tx_rtt_seq = dccp_sk(sk)->dccps_gss;
370 hc->tx_mdev_max = TCP_RTO_MIN; 371 hc->tx_mdev_max = tcp_rto_min(sk);
371 } 372 }
372 } 373 }
373 374