ip: fix merge issue 35/22235/3
authorKlement Sekera <[email protected]>
Thu, 22 Aug 2019 11:34:33 +0000 (11:34 +0000)
committerDamjan Marion <[email protected]>
Wed, 25 Sep 2019 22:05:36 +0000 (22:05 +0000)
commit6f8097ba6e402a77c55d25852e76b7cba9c3b6a1
tree8ad709606a906da8794721abe2cdf0949f0da1fd
parent69bf8326f145cf6b63d5cdf9893578266d455ee7
ip: fix merge issue

Signed-off-by: Klement Sekera <[email protected]>
Change-Id: Idd64b0b3eedb7179f6d316b66cea8160ad577990
Type: fix
Fixes: 630ab5846bceddf8d663e9f488a2dc0378949827
Signed-off-by: Klement Sekera <[email protected]>
(cherry picked from commit 95e091b268212c4bc7153d1526fdffd3ce1d647a)
src/vnet/ip/ip6_reassembly.c