summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-03-24 09:19:25 +0100
committerThomas Haller <thaller@redhat.com>2019-03-24 09:19:25 +0100
commit19bd698357bca5760e811a4c34dce2366b460bc1 (patch)
treea8b866ec4f941ae17396cfa0146ea1756f0d48e5
parentee39f3ab79b3f615285ffbe2cece66ad1205d96a (diff)
downloadNetworkManager-19bd698357bca5760e811a4c34dce2366b460bc1.tar.gz
Revert "ovs-port: dissociate the link from the interface device on delete"
Revert this patch for now. It causes a crash and breaks CI tests. This reverts commit ee39f3ab79b3f615285ffbe2cece66ad1205d96a.
-rw-r--r--src/devices/ovs/nm-device-ovs-port.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c
index bc1eb677bd..b96eba686a 100644
--- a/src/devices/ovs/nm-device-ovs-port.c
+++ b/src/devices/ovs/nm-device-ovs-port.c
@@ -139,13 +139,6 @@ del_iface_cb (GError *error, gpointer user_data)
static void
release_slave (NMDevice *device, NMDevice *slave, gboolean configure)
{
- /* Dissociate the platform link from the device -- openvswitch is going
- * to remove the link, not us. We shouldn't care about whatever happen to it.
- * In particular, we don't want to alter the NMDevice state if we see the
- * link go away, because the device may already have another activation
- * enqueued. */
- nm_device_update_from_platform_link (slave, NULL);
-
nm_ovsdb_del_interface (nm_ovsdb_get (), nm_device_get_iface (slave),
del_iface_cb, g_object_ref (slave));
}