File 0001-wickedd-explicitly-unbind-slaves-on-deleti... of Package wicked

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-wickedd-explicitly-unbind-slaves-on-deletion.patch of Package wicked (Revision 9e7cf63061f94155972a85ed6fcbb445)

Currently displaying revision 9e7cf63061f94155972a85ed6fcbb445 , Show latest

From b1864c1fcbedfd49ff55fb82b528ac86b0825317 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
Date: Thu, 21 Dec 2017 10:16:04 +0100
Subject: [PATCH] wickedd: explicitly unbind slaves on deletion
References: bsc#1061051
Upstream: accepted

When a master device is deleted, explicitly clear references
pointing to it on slaves instead to let it perform by further
event, which may arrive later than an attempt to enslave them
into a new, recreated master device (with same name).

diff --git a/src/netinfo.c b/src/netinfo.c
index 3729284e..6a1348cd 100644
--- a/src/netinfo.c
+++ b/src/netinfo.c
@@ -581,6 +581,17 @@ ni_netconfig_device_append(ni_netconfig_t *nc, ni_netdev_t *dev)
 	__ni_netdev_list_append(&nc->interfaces, dev);
 }
 
+static inline void
+ni_netconfig_device_unbind_slave_index(ni_netconfig_t *nc, unsigned int master)
+{
+	ni_netdev_t *dev;
+
+	for (dev = nc->interfaces; dev; dev = dev->next) {
+		if (dev->link.masterdev.index == master)
+			ni_netdev_ref_destroy(&dev->link.masterdev);
+	}
+}
+
 void
 ni_netconfig_device_remove(ni_netconfig_t *nc, ni_netdev_t *dev)
 {
@@ -589,6 +600,7 @@ ni_netconfig_device_remove(ni_netconfig_t *nc, ni_netdev_t *dev)
 	for (pos = &nc->interfaces; (cur = *pos) != NULL; pos = &cur->next) {
 		if (cur == dev) {
 			*pos = cur->next;
+			ni_netconfig_device_unbind_slave_index(nc, cur->link.ifindex);
 			ni_netdev_put(cur);
 			return;
 		}
-- 
2.13.6

Places

File 0001-wickedd-explicitly-unbind-slaves-on-deletion.patch of Package wicked (Revision 9e7cf63061f94155972a85ed6fcbb445)

Places