File 0001-fsm-do-not-use-master-name-after-reset-bsc... of Package wicked.1968

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-fsm-do-not-use-master-name-after-reset-bsc-959356.patch of Package wicked.1968

From 2468b755e9c9c682b48d5609e7e5c976a09e035e Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
Date: Fri, 19 Feb 2016 08:55:22 +0100
Subject: [PATCH] fsm: do not use master name after reset (bsc#959356)

---
 src/fsm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fsm.c b/src/fsm.c
index 1e6d760..02c43ff 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -2981,26 +2981,26 @@ ni_ifworker_references_ok(const ni_ifworker_array_t *guard, ni_ifworker_t *w)
 {
 	if (w->masterdev && w->lowerdev && ((w->masterdev == w->lowerdev) ||
 	    ni_string_eq(w->masterdev->name, w->lowerdev->name))) {
+		ni_ifworker_fail(w, "references %s as master and as lower device",
+				w->masterdev->name);
 		ni_ifworker_array_remove(&w->lowerdev->lowerdev_for, w);
 		ni_ifworker_array_remove(&w->masterdev->children, w);
 		ni_ifworker_set_ref(&w->lowerdev, NULL);
 		ni_ifworker_set_ref(&w->masterdev, NULL);
-		ni_ifworker_fail(w, "references %s as master and as lower device",
-				w->masterdev->name);
 		return FALSE;
 	}
 
 	if (w == w->lowerdev || (w->lowerdev && ni_string_eq(w->name, w->lowerdev->name))) {
+		ni_ifworker_fail(w, "references itself as lower device");
 		ni_ifworker_array_remove(&w->lowerdev->lowerdev_for, w);
 		ni_ifworker_set_ref(&w->lowerdev, NULL);
-		ni_ifworker_fail(w, "references itself as lower device");
 		return FALSE;
 	}
 
 	if (w == w->masterdev || (w->masterdev && ni_string_eq(w->name, w->masterdev->name))) {
+		ni_ifworker_fail(w, "references itself as master device");
 		ni_ifworker_array_remove(&w->masterdev->children, w);
 		ni_ifworker_set_ref(&w->masterdev, NULL);
-		ni_ifworker_fail(w, "references itself as master device");
 		return FALSE;
 	}
 
-- 
2.6.2

Places

File 0001-fsm-do-not-use-master-name-after-reset-bsc-959356.patch of Package wicked.1968

Places