picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: link_enter_configured remove assert (#4800) 

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
This commit is contained in:
Susant Sahani 2016-12-05 20:01:48 +05:30 committed by Zbigniew Jędrzejewski-Szmek
parent 3099caf2b5
commit e3a7b04848
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/networkd-link.c
View 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) {