summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/ip/ip4_reassembly.c1
-rw-r--r--src/vnet/ip/ip6_reassembly.c1
-rw-r--r--src/vnet/l2/l2_fib.c4
3 files changed, 6 insertions, 0 deletions
diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c
index d5f0b8a7e66..b894c3b83fe 100644
--- a/src/vnet/ip/ip4_reassembly.c
+++ b/src/vnet/ip/ip4_reassembly.c
@@ -1291,6 +1291,7 @@ ip4_reass_set (u32 timeout_ms, u32 max_reassemblies,
clib_bihash_free_16_8 (&ip4_reass_main.hash);
clib_memcpy_fast (&ip4_reass_main.hash, &new_hash,
sizeof (ip4_reass_main.hash));
+ clib_bihash_copied (&ip4_reass_main.hash, &new_hash);
}
}
return 0;
diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c
index a8b6d2c8a0e..7b0d84de289 100644
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -1270,6 +1270,7 @@ ip6_reass_set (u32 timeout_ms, u32 max_reassemblies,
clib_bihash_free_48_8 (&ip6_reass_main.hash);
clib_memcpy_fast (&ip6_reass_main.hash, &new_hash,
sizeof (ip6_reass_main.hash));
+ clib_bihash_copied (&ip6_reass_main.hash, &new_hash);
}
}
return 0;
diff --git a/src/vnet/l2/l2_fib.c b/src/vnet/l2/l2_fib.c
index fc518fe9dbf..b7646cac4cd 100644
--- a/src/vnet/l2/l2_fib.c
+++ b/src/vnet/l2/l2_fib.c
@@ -1000,6 +1000,10 @@ l2fib_scan (vlib_main_t * vm, f64 start_time, u8 event_only)
vl_api_l2_macs_event_t *mp = 0;
vl_api_registration_t *reg = 0;
+ /* Don't scan the l2 fib if it hasn't been instantiated yet */
+ if (alloc_arena (h) == 0)
+ return 0.0;
+
if (client)
{
mp = allocate_mac_evt_buf (client, cl_idx);