ip: speed up reassembly code compilation

[vpp.git] / 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 2894131..f18bbe0 100644 (file)
--- a/src/vnet/ip/reass/ip6_sv_reass.c
+++ b/src/vnet/ip/reass/ip6_sv_reass.c
@@ -50,7 +50,7 @@ typedef struct
     {
       ip6_address_t src;
       ip6_address_t dst;
-      u32 xx_id;
+      u32 fib_index;
       u32 frag_id;
       u8 unused[7];
       u8 proto;
@@ -645,31 +645,27 @@ ip6_sv_reassembly_inline (vlib_main_t * vm,
              goto packet_enqueue;
            }
 
+         u32 counter = ~0;
          switch (ip6_sv_reass_update (vm, node, rm, reass, bi0, frag_hdr))
            {
            case IP6_SV_REASS_RC_OK:
              /* nothing to do here */
              break;
            case IP6_SV_REASS_RC_TOO_MANY_FRAGMENTS:
-             vlib_node_increment_counter (vm, node->node_index,
-                                          IP6_ERROR_REASS_FRAGMENT_CHAIN_TOO_LONG,
-                                          1);
-             ip6_sv_reass_free (vm, rm, rt, reass);
-             goto next_packet;
+             counter = IP6_ERROR_REASS_FRAGMENT_CHAIN_TOO_LONG;
              break;
            case IP6_SV_REASS_RC_UNSUPP_IP_PROTO:
-             vlib_node_increment_counter (vm, node->node_index,
-                                          IP6_ERROR_REASS_UNSUPP_IP_PROTO,
-                                          1);
-             ip6_sv_reass_free (vm, rm, rt, reass);
-             goto next_packet;
+             counter = IP6_ERROR_REASS_UNSUPP_IP_PROTO;
              break;
            case IP6_SV_REASS_RC_INTERNAL_ERROR:
-             vlib_node_increment_counter (vm, node->node_index,
-                                          IP6_ERROR_REASS_INTERNAL_ERROR, 1);
+             counter = IP6_ERROR_REASS_INTERNAL_ERROR;
+             break;
+           }
+         if (~0 != counter)
+           {
+             vlib_node_increment_counter (vm, node->node_index, counter, 1);
              ip6_sv_reass_free (vm, rm, rt, reass);
              goto next_packet;
-             break;
            }
 
          if (reass->is_complete)
@@ -1057,9 +1053,10 @@ static u8 *
 format_ip6_sv_reass_key (u8 * s, va_list * args)
 {
   ip6_sv_reass_key_t *key = va_arg (*args, ip6_sv_reass_key_t *);
-  s = format (s, "xx_id: %u, src: %U, dst: %U, frag_id: %u, proto: %u",
-             key->xx_id, format_ip6_address, &key->src, format_ip6_address,
-             &key->dst, clib_net_to_host_u16 (key->frag_id), key->proto);
+  s =
+    format (s, "fib_index: %u, src: %U, dst: %U, frag_id: %u, proto: %u",
+           key->fib_index, format_ip6_address, &key->src, format_ip6_address,
+           &key->dst, clib_net_to_host_u16 (key->frag_id), key->proto);
   return s;
 }