X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_newreno.c;h=c40e44327323d0ca6f9f36e829515e8d43982709;hb=c5df8c71c;hp=0f43d21dfde39da23fd81dec5efc362387c573ef;hpb=d2aab838ea7875d7f58246b80285e299b137fbf1;p=vpp.git diff --git a/src/vnet/tcp/tcp_newreno.c b/src/vnet/tcp/tcp_newreno.c index 0f43d21dfde..c40e4432732 100644 --- a/src/vnet/tcp/tcp_newreno.c +++ b/src/vnet/tcp/tcp_newreno.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -37,15 +37,7 @@ newreno_rcv_ack (tcp_connection_t * tc) else { /* tc->cwnd += clib_max ((tc->snd_mss * tc->snd_mss) / tc->cwnd, 1); */ - tc->cwnd_acc_bytes += tc->bytes_acked; - if (tc->cwnd_acc_bytes >= tc->cwnd) - { - u32 inc = tc->cwnd_acc_bytes / tc->cwnd; - tc->cwnd += inc * tc->snd_mss; - tc->cwnd_acc_bytes -= inc * tc->cwnd; - } - tc->cwnd = clib_min (tc->cwnd, - transport_tx_fifo_size (&tc->connection)); + tcp_cwnd_accumulate (tc, tc->cwnd, tc->bytes_acked); } } @@ -87,6 +79,7 @@ newreno_conn_init (tcp_connection_t * tc) } const static tcp_cc_algorithm_t tcp_newreno = { + .name = "newreno", .congestion = newreno_congestion, .recovered = newreno_recovered, .rcv_ack = newreno_rcv_ack,