From: Ben Pfaff <blp@nicira.com>
Date: Tue, 9 Mar 2010 00:31:55 +0000 (-0800)
Subject: ovs-brcompatd: Fix stupid merge error.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad73195fcc8ced6be8506b4570aba6f640cd53a;p=openvswitch

ovs-brcompatd: Fix stupid merge error.

Apparently I can no longer rely on myself to look for compiler warnings
before I push.

Introduced in commit 4b3a0009 "ovs-brcompatd: Delete what Bridge
references when deleting a Bridge."
---

diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index 45ded7b8..b5037056 100644
--- a/vswitchd/ovs-brcompatd.c
+++ b/vswitchd/ovs-brcompatd.c
@@ -817,7 +817,7 @@ handle_port_cmd(struct ovsdb_idl *idl,
                         ovsdb_idl_txn_add_comment(txn,
                                                   "ovs-brcompatd: del-if %s",
                                                   port_name);
-                        del_port(br, port_name);
+                        del_port(br, port);
                     }
                 }