commit 5a7f2f1224716130b50e48232e4c276fbebe63bc
author Tom Seidenberg <tseidenb@cisco.com> Tue Apr 28 17:58:12 2020 -0400
committer Florin Coras <florin.coras@gmail.com> Wed Apr 29 17:48:55 2020 +0000
tree f6ebaa61bea2473c014354c153fec12052b066db
parent 4ba16a44b1f091bacc32fe6fa9f726e9a0d3b0e7

ip: use thread local vm instead of thread main for vlib_time_now calls

Type: fix
Change-Id: I8d68e7c7392dcb748a2a84e72c7b1ca0c6c0eb07
Signed-off-by: Tom Seidenberg <tseidenb@cisco.com>

src/vnet/ip/reass/ip4_sv_reass.c

diff --git a/src/vnet/ip/reass/ip4_sv_reass.c b/src/vnet/ip/reass/ip4_sv_reass.c
index 63debef..bc7da30 100644
--- a/src/vnet/ip/reass/ip4_sv_reass.c
+++ b/src/vnet/ip/reass/ip4_sv_reass.c
@@ -305,7 +305,7 @@
 			     ip4_sv_reass_kv_t * kv, u8 * do_handoff)
 {
   ip4_sv_reass_t *reass = NULL;
-  f64 now = vlib_time_now (rm->vlib_main);
+  f64 now = vlib_time_now (vm);
 
   if (!clib_bihash_search_16_8 (&rm->hash, &kv->kv, &kv->kv))
     {

src/vnet/ip/reass/ip6_sv_reass.c

diff --git a/src/vnet/ip/reass/ip6_sv_reass.c b/src/vnet/ip/reass/ip6_sv_reass.c
index 720b430..6d707af 100644
--- a/src/vnet/ip/reass/ip6_sv_reass.c
+++ b/src/vnet/ip/reass/ip6_sv_reass.c
@@ -303,7 +303,7 @@
 			     u8 * do_handoff)
 {
   ip6_sv_reass_t *reass = NULL;
-  f64 now = vlib_time_now (rm->vlib_main);
+  f64 now = vlib_time_now (vm);
 
   if (!clib_bihash_search_48_8 (&rm->hash, &kv->kv, &kv->kv))
     {