From c43f2a3282cb45742b03c0b550ee8e614f7db904 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 2 Mar 2010 14:19:13 -0800 Subject: [PATCH] ovs-brcompatd: Don't delete bridge twice. Somehow I totally goofed when I wrote commit dcdf169e "ovs-brcompatd: Delete Bridge record when deleting a bridge." In fact, del_bridge() already deleted the Bridge record, and I missed that, and so I added a *second* call to ovsrec_bridge_delete(br). Obviously that's bad. This commit removes the first call to delete the bridge. It is a slight improvement over simply reverting the buggy commit in that it doesn't refer to 'br' (just as a pointer equality comparison) after deleting it. Bug #2448. --- vswitchd/ovs-brcompatd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index bf571d743..dd7ea42f7 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -498,8 +498,6 @@ del_bridge(const struct ovsrec_open_vswitch *ovs, const char *br_name) del_port(br, br_name); - ovsrec_bridge_delete(br); - bridges = xmalloc(sizeof *ovs->bridges * ovs->n_bridges); for (i = n = 0; i < ovs->n_bridges; i++) { if (ovs->bridges[i] != br) { -- 2.43.0