From: Ben Pfaff <blp@nicira.com>
Date: Mon, 21 Sep 2009 22:34:27 +0000 (-0700)
Subject: brcompatd: Delete VLAN tags only for the correct port in del_port().
X-Git-Tag: v0.90.6~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=36becebea2d1e816a636d62a226521d0bf26bb18;p=sliver-openvswitch.git

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.
---

diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index 50ed632a2..13bb843dd 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