summaryrefslogtreecommitdiffstats
path: root/src/vnet/ip/reass/ip6_full_reass.c
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2019-06-25 11:19:22 +0000
committerOle Trøan <otroan@employees.org>2019-09-26 14:12:07 +0000
commitde34c35fc73226943538149fae9dbc5cfbdc6e75 (patch)
treeab354210305403bc29a3effc7c002f947422cb9f /src/vnet/ip/reass/ip6_full_reass.c
parent33538a15087eea7c994b6f3d8a952c4b6ea98ee4 (diff)
ip: add shallow virtual reassembly functionality
Type: feature Change-Id: Ibc8334e26c7e6f6120696c3e313b6e11d73dab99 Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/ip/reass/ip6_full_reass.c')
-rw-r--r--src/vnet/ip/reass/ip6_full_reass.c35
1 files changed, 9 insertions, 26 deletions
diff --git a/src/vnet/ip/reass/ip6_full_reass.c b/src/vnet/ip/reass/ip6_full_reass.c
index ef1014922c5..0b41dea5a87 100644
--- a/src/vnet/ip/reass/ip6_full_reass.c
+++ b/src/vnet/ip/reass/ip6_full_reass.c
@@ -1101,12 +1101,8 @@ ip6_full_reassembly_inline (vlib_main_t * vm,
if (PREDICT_FALSE (do_handoff))
{
next0 = IP6_FULL_REASSEMBLY_NEXT_HANDOFF;
- if (is_feature)
- vnet_buffer (b0)->ip.reass.owner_feature_thread_index =
- kv.v.memory_owner_thread_index;
- else
- vnet_buffer (b0)->ip.reass.owner_thread_index =
- kv.v.memory_owner_thread_index;
+ vnet_buffer (b0)->ip.reass.owner_thread_index =
+ kv.v.memory_owner_thread_index;
}
else if (reass)
{
@@ -1121,12 +1117,8 @@ ip6_full_reassembly_inline (vlib_main_t * vm,
case IP6_FULL_REASS_RC_HANDOFF:
next0 = IP6_FULL_REASSEMBLY_NEXT_HANDOFF;
b0 = vlib_get_buffer (vm, bi0);
- if (is_feature)
- vnet_buffer (b0)->ip.reass.owner_feature_thread_index =
- handoff_thread_idx;
- else
- vnet_buffer (b0)->ip.reass.owner_thread_index =
- handoff_thread_idx;
+ vnet_buffer (b0)->ip.reass.owner_thread_index =
+ handoff_thread_idx;
break;
case IP6_FULL_REASS_RC_TOO_MANY_FRAGMENTS:
vlib_node_increment_counter (vm, node->node_index,
@@ -1179,16 +1171,10 @@ ip6_full_reassembly_inline (vlib_main_t * vm,
{
if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
{
- if (is_feature)
- ip6_full_reass_add_trace (vm, node, rm, NULL, bi0,
- HANDOFF,
- vnet_buffer (b0)->ip.
- reass.owner_feature_thread_index);
- else
- ip6_full_reass_add_trace (vm, node, rm, NULL, bi0,
- HANDOFF,
- vnet_buffer (b0)->ip.
- reass.owner_thread_index);
+ ip6_full_reass_add_trace (vm, node, rm, NULL, bi0,
+ HANDOFF,
+ vnet_buffer (b0)->ip.
+ reass.owner_thread_index);
}
}
else if (is_feature && IP6_ERROR_NONE == error0)
@@ -1730,10 +1716,7 @@ ip6_full_reassembly_handoff_inline (vlib_main_t * vm,
while (n_left_from > 0)
{
- ti[0] =
- (is_feature) ? vnet_buffer (b[0])->ip.
- reass.owner_feature_thread_index : vnet_buffer (b[0])->ip.
- reass.owner_thread_index;
+ ti[0] = vnet_buffer (b[0])->ip.reass.owner_thread_index;
if (PREDICT_FALSE
((node->flags & VLIB_NODE_FLAG_TRACE)