From 8a3e575dfca22500744df76c40de600d8aa61e12 Mon Sep 17 00:00:00 2001 From: Steve Shin Date: Tue, 20 Feb 2018 11:38:34 -0800 Subject: Fix reset the vlan flags when main interface is deleted. The dot1q_vlans & dot1ad_vlans should be reset to 0 when main interface is deleted. Otherwise, VPP will crash if the same interface index is reused without attaching the sub interface on it. Change-Id: I484d4a8892ff4241a3a32b22189746193d5f2594 Signed-off-by: Steve Shin --- src/vnet/ethernet/interface.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/vnet/ethernet') diff --git a/src/vnet/ethernet/interface.c b/src/vnet/ethernet/interface.c index 801c99f824d..091ca2977ee 100644 --- a/src/vnet/ethernet/interface.c +++ b/src/vnet/ethernet/interface.c @@ -344,6 +344,7 @@ ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index) } } pool_put_index (em->vlan_pool, main_intf->dot1q_vlans); + main_intf->dot1q_vlans = 0; } if (main_intf->dot1ad_vlans) { @@ -356,6 +357,7 @@ ethernet_delete_interface (vnet_main_t * vnm, u32 hw_if_index) } } pool_put_index (em->vlan_pool, main_intf->dot1ad_vlans); + main_intf->dot1ad_vlans = 0; } vnet_delete_hw_interface (vnm, hw_if_index); -- cgit 1.2.3-korg