X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Finterface.c;h=b57c1e8a01a4f27c05833dbd33e6f110516fb9b6;hb=7c8eda16d4bc10bf779200b23369e2ee12843dc1;hp=7a808add832a601e2257a26d23858a02b5e968bf;hpb=86d87c40dd97ced69c939299204fadf1859a2f50;p=vpp.git

diff --git a/vnet/vnet/interface.c b/vnet/vnet/interface.c
index 7a808add832..b57c1e8a01a 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);