From: Ethan Jackson <ethan@nicira.com>
Date: Fri, 16 Aug 2013 01:37:41 +0000 (-0700)
Subject: ofproto-dpif-xlate: Unreference handles on xbridge removal.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=795cc5c1c4872045ad76dac34fef51ec3124eb47;p=sliver-openvswitch.git

ofproto-dpif-xlate: Unreference handles on xbridge removal.

Reported-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Ethan Jackson <ethan@nicira.com>
[blp@nicira.com added one more hmap_destroy()]
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 8be808827..e80ec8491 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -289,6 +289,12 @@ xlate_remove_ofproto(struct ofproto_dpif *ofproto)
     }
 
     hmap_remove(&xbridges, &xbridge->hmap_node);
+    mac_learning_unref(xbridge->ml);
+    mbridge_unref(xbridge->mbridge);
+    dpif_sflow_unref(xbridge->sflow);
+    dpif_ipfix_unref(xbridge->ipfix);
+    stp_unref(xbridge->stp);
+    hmap_destroy(&xbridge->xports);
     free(xbridge->name);
     free(xbridge);
 }