From: Ethan Jackson <ethan@nicira.com>
Date: Fri, 7 Jan 2011 00:17:23 +0000 (-0800)
Subject: vswitchd: Fix segmentation fault with bonded ports.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ca5f243114d0c029dfa551c7282d50487bfa8b0;p=openvswitch

vswitchd: Fix segmentation fault with bonded ports.

This commit fixes a segmentation fault which could occur when a
bonded port was destroyed.
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index e2d26c00..f7890e95 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3984,6 +3984,10 @@ iface_destroy(struct iface *iface)
         bool del_active = port->active_iface == iface->port_ifidx;
         struct iface *del;
 
+        if (port->monitor) {
+            netdev_monitor_remove(port->monitor, iface->netdev);
+        }
+
         shash_find_and_delete_assert(&br->iface_by_name, iface->name);
 
         if (iface->dp_ifidx >= 0) {