From 4fadfb5644bfc91cf719a0783f17121042db0035 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Fri, 4 Feb 2011 11:01:43 -0800
Subject: [PATCH] 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.
---
 vswitchd/bridge.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index bb67e17f..f786108c 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;
     }
 
-- 
2.30.2