Merge pull request #334 from pwieczorkiewicz/no-persistent

Set client-info and client-state earlier, do not auto detect persistance
openSUSE · Jul 22, 2014 · 6aa00b9 · 6aa00b9
2 parents 788d36f + 25560e1
commit 6aa00b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/fsm.c b/src/fsm.c
@@ -1163,15 +1163,15 @@ ni_ifworker_set_state(ni_ifworker_t *w, unsigned int new_state)
 		if (w->fsm.wait_for && w->fsm.wait_for->next_state == new_state)
 			w->fsm.wait_for = NULL;
 
-		if (w->target_state == new_state) {
-			if (w->object && !w->readonly) {
-				if (prev_state < new_state)
-					ni_ifworker_update_client_state(w);
-				if (new_state != NI_FSM_STATE_DEVICE_DOWN)
-					ni_ifworker_update_client_info(w);
-			}
-			ni_ifworker_success(w);
+		if (new_state == NI_FSM_STATE_DEVICE_READY &&
+		    w->object && !w->readonly) {
+			if (prev_state < new_state)
+				ni_ifworker_update_client_state(w);
+			ni_ifworker_update_client_info(w);
 		}
+
+		if (w->target_state == new_state)
+			ni_ifworker_success(w);
 	}
 }
 

diff --git a/src/netdev.c b/src/netdev.c
@@ -601,8 +601,6 @@ ni_netdev_discover_client_state(ni_netdev_t *dev)
 		state = NI_FSM_STATE_LINK_UP;
 
 	cs = ni_client_state_new(state);
-	NI_CLIENT_STATE_SET_CONTROL_FLAG(cs->persistent,
-			state >= NI_FSM_STATE_LINK_UP, TRUE);
 
 	ni_netdev_set_client_state(dev, cs);
 }