Add VLIB_NODE_FN() macro to simplify multiversioning of node functions

[vpp.git] / src / vnet / ip / ip4_reassembly.c

diff --git a/src/vnet/ip/ip4_reassembly.c b/src/vnet/ip/ip4_reassembly.c
index 114d8e0..d924f37 100644 (file)
--- a/src/vnet/ip/ip4_reassembly.c
+++ b/src/vnet/ip/ip4_reassembly.c
@@ -402,7 +402,7 @@ always_inline void
 ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
                    ip4_reass_main_t * rm, ip4_reass_per_thread_t * rt,
                    ip4_reass_t * reass, u32 * bi0, u32 * next0,
-                   vlib_error_t * error0, u32 ** vec_drop_compress,
+                   u32 * error0, u32 ** vec_drop_compress,
                    u32 ** vec_drop_overlap, bool is_feature)
 {
   ASSERT (~0 != reass->first_bi);
@@ -497,6 +497,8 @@ ip4_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
        reass.next_range_bi;
     }
   while (~0 != sub_chain_bi);
+
+  ASSERT (last_b != NULL);
   last_b->flags &= ~VLIB_BUFFER_NEXT_PRESENT;
   ASSERT (rt->buffers_n >= (buf_cnt - dropped_cnt));
   rt->buffers_n -= buf_cnt - dropped_cnt;
@@ -649,7 +651,7 @@ always_inline void
 ip4_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
                  ip4_reass_main_t * rm, ip4_reass_per_thread_t * rt,
                  ip4_reass_t * reass, u32 * bi0, u32 * next0,
-                 vlib_error_t * error0, u32 ** vec_drop_overlap,
+                 u32 * error0, u32 ** vec_drop_overlap,
                  u32 ** vec_drop_compress, bool is_feature)
 {
   int consumed = 0;
@@ -1108,8 +1110,7 @@ ip4_reass_set (u32 timeout_ms, u32 max_reassemblies,
                             ip4_reass_main.ip4_reass_expire_node_idx,
                             IP4_EVENT_CONFIG_CHANGED, 0);
   u32 new_nbuckets = ip4_reass_get_nbuckets ();
-  if (ip4_reass_main.max_reass_n > 0 && new_nbuckets > 1 &&
-      new_nbuckets != old_nbuckets)
+  if (ip4_reass_main.max_reass_n > 0 && new_nbuckets > old_nbuckets)
     {
       clib_bihash_24_8_t new_hash;
       memset (&new_hash, 0, sizeof (new_hash));
@@ -1168,6 +1169,10 @@ ip4_reass_init_function (vlib_main_t * vm)
   ASSERT (node);
   rm->ip4_reass_expire_node_idx = node->index;
 
+  ip4_reass_set_params (IP4_REASS_TIMEOUT_DEFAULT_MS,
+                       IP4_REASS_MAX_REASSEMBLIES_DEFAULT,
+                       IP4_REASS_EXPIRE_WALK_INTERVAL_DEFAULT_MS);
+
   nbuckets = ip4_reass_get_nbuckets ();
   clib_bihash_init_24_8 (&rm->hash, "ip4-reass", nbuckets, nbuckets * 1024);
 
@@ -1175,10 +1180,6 @@ ip4_reass_init_function (vlib_main_t * vm)
   ASSERT (node);
   rm->ip4_drop_idx = node->index;
 
-  ip4_reass_set_params (IP4_REASS_TIMEOUT_DEFAULT_MS,
-                       IP4_REASS_MAX_REASSEMBLIES_DEFAULT,
-                       IP4_REASS_EXPIRE_WALK_INTERVAL_DEFAULT_MS);
-
   return error;
 }