Improve ip_mroute_add_del documentation

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

diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c
index ff62b01..50445f2 100644 (file)
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -663,6 +663,7 @@ ip6_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
   int consumed = 0;
   vlib_buffer_t *fb = vlib_get_buffer (vm, *bi0);
   vnet_buffer_opaque_t *fvnb = vnet_buffer (fb);
+  reass->next_index = fvnb->ip.reass.next_index;       // store next_index before it's overwritten
   fvnb->ip.reass.ip6_frag_hdr_offset =
     (u8 *) frag_hdr - (u8 *) vlib_buffer_get_current (fb);
   ip6_header_t *fip = vlib_buffer_get_current (fb);
@@ -989,8 +990,8 @@ ip6_reassembly_inline (vlib_main_t * vm,
              n_left_to_next -= 1;
              if (is_feature && IP6_ERROR_NONE == error0)
                {
-                 vnet_feature_next (vnet_buffer (b0)->sw_if_index[VLIB_RX],
-                                    &next0, b0);
+                 b0 = vlib_get_buffer (vm, bi0);
+                 vnet_feature_next (&next0, b0);
                }
              vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
                                               n_left_to_next, bi0, next0);
@@ -1341,7 +1342,7 @@ ip6_reass_walk_expired (vlib_main_t * vm,
              to_next += 1;
              n_left_to_next -= 1;
            }
-         f->flags |= (trace_frame * VLIB_FRAME_TRACE);
+         f->frame_flags |= (trace_frame * VLIB_FRAME_TRACE);
          vlib_put_frame_to_node (vm, rm->ip6_drop_idx, f);
        }
 
@@ -1375,7 +1376,7 @@ ip6_reass_walk_expired (vlib_main_t * vm,
              to_next += 1;
              n_left_to_next -= 1;
            }
-         f->flags |= (trace_frame * VLIB_FRAME_TRACE);
+         f->frame_flags |= (trace_frame * VLIB_FRAME_TRACE);
          vlib_put_frame_to_node (vm, rm->ip6_icmp_error_idx, f);
        }