From 6f8097ba6e402a77c55d25852e76b7cba9c3b6a1 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Thu, 22 Aug 2019 11:34:33 +0000 Subject: ip: fix merge issue Signed-off-by: Klement Sekera Change-Id: Idd64b0b3eedb7179f6d316b66cea8160ad577990 Type: fix Fixes: 630ab5846bceddf8d663e9f488a2dc0378949827 Signed-off-by: Klement Sekera (cherry picked from commit 95e091b268212c4bc7153d1526fdffd3ce1d647a) --- src/vnet/ip/ip6_reassembly.c | 2 -- 1 file changed, 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, -- cgit 1.2.3-korg