Merge pull request #422 from pwieczorkiewicz/rearm-fix2

openSUSE · Sep 16, 2014 · b2573a0 · b2573a0
2 parents 2ee54b7 + 31d2fd6
commit b2573a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/schema/interface.xml b/schema/interface.xml
@@ -197,7 +197,7 @@
    <txqlen type="uint32"/>
    <alias type="string"/>
    <master type="string">
-     <meta:netif-reference/> <!-- shared="false" ??? -->
+     <meta:netif-reference shared="false"/>
    </master>
 
    <ipv4 type="network-interface:af-info"/>

diff --git a/src/fsm.c b/src/fsm.c
@@ -131,6 +131,8 @@ ni_ifworker_new(ni_fsm_t *fsm, ni_ifworker_type_t type, const char *name)
 static void
 __ni_ifworker_reset_fsm(ni_ifworker_t *w)
 {
+	ni_fsm_require_t *req_list;
+
 	if (!w)
 		return;
 
@@ -143,8 +145,9 @@ __ni_ifworker_reset_fsm(ni_ifworker_t *w)
 	}
 	w->fsm.action_table = NULL;
 
-	ni_fsm_require_list_destroy(&w->fsm.child_state_req_list);
+	req_list = w->fsm.child_state_req_list;
 	memset(&w->fsm, 0, sizeof(w->fsm));
+	w->fsm.child_state_req_list = req_list;
 }
 
 void