summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Seidenberg <tseidenb@cisco.com>2020-04-28 17:58:12 -0400
committerFlorin Coras <florin.coras@gmail.com>2020-04-29 17:48:55 +0000
commit5a7f2f1224716130b50e48232e4c276fbebe63bc (patch)
treef6ebaa61bea2473c014354c153fec12052b066db
parent4ba16a44b1f091bacc32fe6fa9f726e9a0d3b0e7 (diff)
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>
-rw-r--r--src/vnet/ip/reass/ip4_sv_reass.c2
-rw-r--r--src/vnet/ip/reass/ip6_sv_reass.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vnet/ip/reass/ip4_sv_reass.c b/src/vnet/ip/reass/ip4_sv_reass.c
index 63debefbc98..bc7da306006 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_find_or_create (vlib_main_t * vm, ip4_sv_reass_main_t * rm,
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))
{
diff --git a/src/vnet/ip/reass/ip6_sv_reass.c b/src/vnet/ip/reass/ip6_sv_reass.c
index 720b430cb50..6d707af1f94 100644
--- a/src/vnet/ip/reass/ip6_sv_reass.c
+++ b/src/vnet/ip/reass/ip6_sv_reass.c
@@ -303,7 +303,7 @@ ip6_sv_reass_find_or_create (vlib_main_t * vm, vlib_node_runtime_t * node,
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))
{