From 36becebea2d1e816a636d62a226521d0bf26bb18 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 21 Sep 2009 15:34:27 -0700 Subject: [PATCH] brcompatd: Delete VLAN tags only for the correct port in del_port(). vlan.%s.* will match e.g. eth0.123 if the %s expands to eth0. We only want it to match eth0 in that case. This is based on code inspection. It may or may not fix a real problem. --- vswitchd/ovs-brcompatd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 50ed632a..13bb843d 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -525,7 +525,7 @@ del_port(const char *br_name, const char *port_name) { cfg_del_entry("bridge.%s.port=%s", br_name, port_name); cfg_del_match("bonding.*.slave=%s", port_name); - cfg_del_match("vlan.%s.*", port_name); + cfg_del_match("vlan.%s.[!0-9]*", port_name); } static int -- 2.30.2