diff options
| -rw-r--r-- | src/vnet/tcp/tcp_cubic.c | 6 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_input.c | 6 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_newreno.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/vnet/tcp/tcp_cubic.c b/src/vnet/tcp/tcp_cubic.c index cc2ffeae9f0..3160e528e6d 100644 --- a/src/vnet/tcp/tcp_cubic.c +++ b/src/vnet/tcp/tcp_cubic.c @@ -158,7 +158,7 @@ cubic_rcv_ack (tcp_connection_t * tc, tcp_rate_sample_t * rs) if (tcp_in_slowstart (tc)) { - tc->cwnd += tc->bytes_acked; + tc->cwnd += rs->delivered; return; } @@ -169,7 +169,7 @@ cubic_rcv_ack (tcp_connection_t * tc, tcp_rate_sample_t * rs) w_aimd = (u64) W_est (cd, t, rtt_sec) * tc->snd_mss; if (w_cubic < w_aimd) { - cubic_cwnd_accumulate (tc, tc->cwnd, tc->bytes_acked); + cubic_cwnd_accumulate (tc, tc->cwnd, rs->delivered); } else { @@ -195,7 +195,7 @@ cubic_rcv_ack (tcp_connection_t * tc, tcp_rate_sample_t * rs) /* Practically we can't increment so just inflate threshold */ thresh = 50 * tc->cwnd; } - cubic_cwnd_accumulate (tc, thresh, tc->bytes_acked); + cubic_cwnd_accumulate (tc, thresh, rs->delivered); } } diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 30d57a3bb3e..5f165c01b4c 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -866,8 +866,7 @@ tcp_cc_handle_event (tcp_connection_t * tc, tcp_rate_sample_t * rs, tcp_fastrecovery_first_on (tc); tc->rxt_delivered += tc->sack_sb.rxt_sacked; - tc->prr_delivered += tc->bytes_acked + tc->sack_sb.last_sacked_bytes - - tc->sack_sb.last_bytes_delivered; + tc->prr_delivered += rs->delivered; } else { @@ -1042,6 +1041,9 @@ process_ack: if (tc->cfg_flags & TCP_CFG_F_RATE_SAMPLE) tcp_bt_sample_delivery_rate (tc, &rs); + else + rs.delivered = tc->bytes_acked + tc->sack_sb.last_sacked_bytes - + tc->sack_sb.last_bytes_delivered; if (tc->bytes_acked + tc->sack_sb.last_sacked_bytes) { diff --git a/src/vnet/tcp/tcp_newreno.c b/src/vnet/tcp/tcp_newreno.c index c5ffc2a4109..39035bac00c 100644 --- a/src/vnet/tcp/tcp_newreno.c +++ b/src/vnet/tcp/tcp_newreno.c @@ -49,12 +49,12 @@ newreno_rcv_ack (tcp_connection_t * tc, tcp_rate_sample_t * rs) { if (tcp_in_slowstart (tc)) { - tc->cwnd += clib_min (tc->snd_mss, tc->bytes_acked); + tc->cwnd += clib_min (tc->snd_mss, rs->delivered); } else { /* tc->cwnd += clib_max ((tc->snd_mss * tc->snd_mss) / tc->cwnd, 1); */ - tcp_cwnd_accumulate (tc, tc->cwnd, tc->bytes_acked); + tcp_cwnd_accumulate (tc, tc->cwnd, rs->delivered); } } |