From 32dfd77df0240d26eebe7dd2058b36d66289bda8 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Mon, 27 Feb 2017 21:00:02 +0100 Subject: Clean up the L2 interface configs when creating the interfaces Without the cleanup in the L2 input/output configs, the creation of an interface with sw_if_index belonging to a previously deleted interface will use the stale vlan tag push-pop configuration from that interface, resulting in loss of connectivity when the host receives tagged packets but expects untagged ones. Change-Id: Ic186390ef3a41277f57847ed2962848b98379092 Signed-off-by: Andrew Yourtchenko --- vnet/vnet/interface.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vnet/vnet/interface.c b/vnet/vnet/interface.c index 78610ed460b..0ed4cf6987b 100644 --- a/vnet/vnet/interface.c +++ b/vnet/vnet/interface.c @@ -41,6 +41,7 @@ #include #include #include +#include #define VNET_INTERFACE_SET_FLAGS_HELPER_IS_CREATE (1 << 0) #define VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE (1 << 1) @@ -582,6 +583,15 @@ vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm, vnet_interface_counter_unlock (im); } + /* Wipe any stale l2 input config data. */ + if (sw_if_index < vec_len (l2input_main.configs)) + memset (vec_elt_at_index (l2input_main.configs, sw_if_index), + 0, sizeof (l2_input_config_t)); + + /* Wipe any stale l2 output config data. */ + if (sw_if_index < vec_len (l2output_main.configs)) + memset (vec_elt_at_index (l2output_main.configs, sw_if_index), + 0, sizeof (l2_output_config_t)); return sw_if_index; } -- cgit 1.2.3-korg