]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: link_enter_configured remove assert (#4800)
authorSusant Sahani <ssahani@users.noreply.github.com>
Mon, 5 Dec 2016 14:31:48 +0000 (20:01 +0530)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 5 Dec 2016 14:31:48 +0000 (09:31 -0500)
When we are in link_enter_configured we assume that the
link->state should be LINK_STATE_SETTING_ROUTES but in some
situation it's LINK_STATlE_SETTING_ADDRESSES.

Just ignore the wrong state.

Also since the return value not used any where
make link_enter_configured return type void.

Fixes: #4746
src/network/networkd-link.c

index 643578c16457571838f2333f3347b9c9ef9cc2d0..dd0e33a1ce07b60e9a4037988781ea0755b94147 100644 (file)
@@ -686,18 +686,18 @@ static Address* link_find_dhcp_server_address(Link *link) {
         return NULL;
 }
 
-static int link_enter_configured(Link *link) {
+static void link_enter_configured(Link *link) {
         assert(link);
         assert(link->network);
-        assert(link->state == LINK_STATE_SETTING_ROUTES);
+
+        if (link->state != LINK_STATE_SETTING_ROUTES)
+                return;
 
         log_link_info(link, "Configured");
 
         link_set_state(link, LINK_STATE_CONFIGURED);
 
         link_dirty(link);
-
-        return 0;
 }
 
 void link_check_ready(Link *link) {