tcp: fix bt acked_sacked on recovery 74/29374/3
authorFlorin Coras <fcoras@cisco.com>
Fri, 9 Oct 2020 19:04:50 +0000 (12:04 -0700)
committerDave Barach <openvpp@barachs.net>
Tue, 13 Oct 2020 17:38:10 +0000 (17:38 +0000)
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I2e2d76661fbb07dd8c6afa3583bb18e01b7a7fb6

src/vnet/tcp/tcp_bt.c

index 9c255fa..de2e7ad 100644 (file)
@@ -599,11 +599,12 @@ tcp_bt_sample_delivery_rate (tcp_connection_t * tc, tcp_rate_sample_t * rs)
   tc->lost += tc->sack_sb.last_lost_bytes;
 
   delivered = tc->bytes_acked + tc->sack_sb.last_sacked_bytes;
+  /* Do not count bytes that were previously sacked again */
+  delivered -= tc->sack_sb.last_bytes_delivered;
   if (!delivered || tc->bt->head == TCP_BTS_INVALID_INDEX)
     return;
 
-  /* Do not count bytes that were previously sacked again */
-  tc->delivered += delivered - tc->sack_sb.last_bytes_delivered;
+  tc->delivered += delivered;
   tc->delivered_time = tcp_time_now_us (tc->c_thread_index);
 
   if (tc->app_limited && tc->delivered > tc->app_limited)