diff options
| author |   Pavel Kotucek <pkotucek@cisco.com> | 2016-10-17 15:31:59 +0200 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2016-11-15 16:08:20 +0000 |
| commit | 7c8eda16d4bc10bf779200b23369e2ee12843dc1 (patch) | |
| tree | 0e27b12de1b76a8c7f0cd8cbbb6036e163b4973d /vnet | |
| parent | 86d87c40dd97ced69c939299204fadf1859a2f50 (diff) | |
VPP-393: Subinterface is still used after deletion
Fixed bug in delete of sub-interface, if sub-interface is xconnected it
was not deleted correctly (show interface address fails).
Interface is set to L3 mode before deletion.
Fixed help in API command.
Signed-off-by: Pavel Kotucek <pkotucek@cisco.com>
Change-Id: Ibe781e4b53422e6535e34ec72dbe274f9045f051
Diffstat (limited to 'vnet')
| -rw-r--r-- | vnet/vnet/interface.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vnet/vnet/interface.c b/vnet/vnet/interface.c index 7a808add..b57c1e8a 100644 --- a/vnet/vnet/interface.c +++ b/vnet/vnet/interface.c @@ -623,6 +623,16 @@ vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index) vnet_sw_interface_t *sw = pool_elt_at_index (im->sw_interfaces, sw_if_index); + /* Make sure the interface is in L3 mode (removed from L2 BD or XConnect) */ + vlib_main_t *vm = vlib_get_main (); + l2_input_config_t *config; + config = vec_elt_at_index (l2input_main.configs, sw_if_index); + if (config->xconnect) + set_int_l2_mode (vm, vnm, MODE_L3, config->output_sw_if_index, 0, 0, 0, + 0); + if (config->xconnect || config->bridge) + set_int_l2_mode (vm, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0); + /* Bring down interface in case it is up. */ if (sw->flags != 0) vnet_sw_interface_set_flags (vnm, sw_if_index, /* flags */ 0); |