summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2019-08-22 11:34:33 +0000
committerKlement Sekera <ksekera@cisco.com>2019-08-22 11:35:34 +0000
commit95e091b268212c4bc7153d1526fdffd3ce1d647a (patch)
tree1e5311c464fefca7282cdf546478e9fc9d5c8375 /src/vnet
parentab4899257a77edecfbf9a97cf67acc26a2133119 (diff)
ip: fix merge issue
Signed-off-by: Klement Sekera <ksekera@cisco.com> Change-Id: Idd64b0b3eedb7179f6d316b66cea8160ad577990 Type: fix Fixes: 630ab5846bceddf8d663e9f488a2dc0378949827 Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/ip/ip6_reassembly.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/vnet/ip/ip6_reassembly.c b/src/vnet/ip/ip6_reassembly.c
index a65697b15b2..80a9eb8bae4 100644
--- a/src/vnet/ip/ip6_reassembly.c
+++ b/src/vnet/ip/ip6_reassembly.c
@@ -904,8 +904,6 @@ check_if_done_maybe:
if (~0 != reass->last_packet_octet &&
reass->data_len == reass->last_packet_octet + 1)
{
- return ip6_reass_finalize (vm, node, rm, rt, reass, bi0, next0, error0,
- is_custom_app);
*handoff_thread_idx = reass->sendout_thread_index;
ip6_reass_rc_t rc =
ip6_reass_finalize (vm, node, rm, rt, reass, bi0, next0, error0,