From: Ben Pfaff <blp@nicira.com>
Date: Mon, 20 Apr 2009 16:56:27 +0000 (-0700)
Subject: brcomapt: Delete VLANs and bonding entries for deleted ports.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f7d15cb736d324f118620962bbf9d82d3336aab;p=openvswitch

brcomapt: Delete VLANs and bonding entries for deleted ports.

Otherwise these entries can hang around past reboot and cause trouble
later as vif numbers are reused.

Probably another part of the full solution is to delete the whole
configuration file on reboot.

Bug #1216.
---

diff --git a/vswitchd/brcompatd.c b/vswitchd/brcompatd.c
index 5fa0fd97..6054bb46 100644
--- a/vswitchd/brcompatd.c
+++ b/vswitchd/brcompatd.c
@@ -299,6 +299,8 @@ modify_config(const char *br_name, const char *port_name, enum bmc_action act)
 
     case BMC_DEL_PORT: 
         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);
         break;
     }