ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loopback:fix delete to check interface class

Browse Source 
Change-Id: Ia563b279e85b5da93f79db5a2a4d9b8c04f5be99
Signed-off-by: Eyal Bari <ebari@cisco.com>
(cherry picked from commit b52c034c7d53014e9d5c1dfc3501e9adfb0c6391)
This commit is contained in:
Eyal Bari
2018-07-16 19:18:56 +03:00
committed by Florin Coras
parent ee8b973de9
commit e4b49c738b
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vnet/ethernet/interface.c
View File

@ -838,25 +838,18 @@ int
vnet_delete_loopback_interface (u32 sw_if_index) vnet_delete_loopback_interface (u32 sw_if_index)
{ {
vnet_main_t *vnm = vnet_get_main (); vnet_main_t *vnm = vnet_get_main ();
vnet_sw_interface_t *si;
u32 hw_if_index;
vnet_hw_interface_t *hw;
u32 instance;
if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index)) if (pool_is_free_index (vnm->interface_main.sw_interfaces, sw_if_index))
return VNET_API_ERROR_INVALID_SW_IF_INDEX; return VNET_API_ERROR_INVALID_SW_IF_INDEX;
si = vnet_get_sw_interface (vnm, sw_if_index); vnet_hw_interface_t *hw = vnet_get_sup_hw_interface (vnm, sw_if_index);
hw_if_index = si->hw_if_index; if (hw == 0 || hw->dev_class_index != ethernet_simulated_device_class.index)
hw = vnet_get_hw_interface (vnm, hw_if_index); return VNET_API_ERROR_INVALID_SW_IF_INDEX;
instance = hw->dev_instance;
if (loopback_instance_free (instance) < 0) if (loopback_instance_free (hw->dev_instance) < 0)
{ return VNET_API_ERROR_INVALID_SW_IF_INDEX;
return VNET_API_ERROR_INVALID_SW_IF_INDEX;
}
ethernet_delete_interface (vnm, hw_if_index); ethernet_delete_interface (vnm, hw->hw_if_index);
return 0; return 0;
} }