tcp: improve timestamp rtt accuracy

[vpp.git] / src / vnet / tcp / tcp_inlines.h

diff --git a/src/vnet/tcp/tcp_inlines.h b/src/vnet/tcp/tcp_inlines.h
index 2281cd3..cb00ca4 100644 (file)
--- a/src/vnet/tcp/tcp_inlines.h
+++ b/src/vnet/tcp/tcp_inlines.h
@@ -218,8 +218,7 @@ tcp_time_now_us (u32 thread_index)
 always_inline u32
 tcp_set_time_now (tcp_worker_ctx_t * wrk)
 {
-  wrk->time_now = clib_cpu_time_now () * tcp_main.tstamp_ticks_per_clock;
-  return wrk->time_now;
+  return wrk->time_now = (u64) (vlib_time_now (wrk->vm) * TCP_TSTP_HZ);
 }
 
 always_inline tcp_connection_t *
@@ -286,7 +285,7 @@ tcp_input_lookup_buffer (vlib_buffer_t * b, u8 thread_index, u32 * error,
          if (PREDICT_FALSE
              (ip6_address_is_link_local_unicast (&ip6->dst_address)))
            {
-             ip4_main_t *im = &ip4_main;
+             ip6_main_t *im = &ip6_main;
              fib_index = vec_elt (im->fib_index_by_sw_if_index,
                                   vnet_buffer (b)->sw_if_index[VLIB_RX]);
            }