From: Ben Pfaff <blp@nicira.com>
Date: Fri, 4 Feb 2011 19:01:43 +0000 (-0800)
Subject: vswitchd: Deconfigure CFM when not configured.
X-Git-Tag: v1.1.0~336
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4fadfb5644bfc91cf719a0783f17121042db0035;p=sliver-openvswitch.git

vswitchd: Deconfigure CFM when not configured.

It looks to me like, once a CFM object is configured on an interface, it
will never get deconfigured.   This fixes the problem.

Found by inspection.  I haven't tested the original code or the fix.
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index bb67e17fc..f786108cf 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -5021,6 +5021,8 @@ iface_update_cfm(struct iface *iface)
     mon = iface->cfg->monitor;
 
     if (!mon) {
+        cfm_destroy(iface->cfm);
+        iface->cfm = NULL;
         return;
     }