aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2009-09-21 15:34:27 -0700
committerBen Pfaff <blp@nicira.com>2009-09-22 10:08:10 -0700
commit36becebea2d1e816a636d62a226521d0bf26bb18 (patch)
tree4b76aaf2295ff70ff976bcb9a6f3c11bf4b9e182
parentf928967abecdd51d2b9f88ed9984d67e3170aac5 (diff)
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.
-rw-r--r--vswitchd/ovs-brcompatd.c2
1 files changed, 1 insertions, 1 deletions
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