diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-03-31 14:12:57 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-03-31 14:28:42 -0700 |
| commit | 6d6ab93e9dcd91119ea9a1a843c1bb35e6754706 (patch) | |
| tree | 0873031e36fd95132e152c3c563ffbae27e72de6 | |
| parent | 2e2dd32bf7e78fedc6eec6f2d28a98e4781a24e4 (diff) | |
| download | openvswitch-6d6ab93e9dcd91119ea9a1a843c1bb35e6754706.tar.gz | |
bridge: Destroy ofproto before deleting dpif.
Otherwise the ofproto's attempt to flush flows from the dpif will fail with
an error, causing a spurious log message.
| -rw-r--r-- | vswitchd/bridge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index bf89778c6..72091a29a 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1690,13 +1690,13 @@ bridge_destroy(struct bridge *br) port_destroy(port); } list_remove(&br->node); + ofproto_destroy(br->ofproto); error = dpif_delete(br->dpif); if (error && error != ENOENT) { VLOG_ERR("failed to delete %s: %s", dpif_name(br->dpif), strerror(error)); } dpif_close(br->dpif); - ofproto_destroy(br->ofproto); mac_learning_destroy(br->ml); hmap_destroy(&br->ifaces); hmap_destroy(&br->ports); |
