OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net: config: Fix improper condition in net_config_init 

Currently, there is a case for net_config_init function that for
timeout==0 and when iface is already up, the ip setup is not proceed
and the error message "Timeout while waiting network..." is logged.

This commit fixes it.

Signed-off-by: Lukasz Maciejonczyk <lukasz.maciejonczyk@nordicsemi.no>
This commit is contained in:
Lukasz Maciejonczyk 2020-07-20 15:04:24 +02:00 committed by Jukka Rissanen
parent b53f62d259
commit 06fdea7ec8
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
subsys/net/lib/config/init.c
View File

@ -375,24 +375,18 @@ int net_config_init_by_iface(struct net_if *iface, const char *app_info,
}
}
/* If the above while() loop timeouted, reset the count so that
* the while() loop below will not wait more.
*/
if (timeout > 0 && count < 0) {
count = 0;
}
#if defined(CONFIG_NET_NATIVE)
net_mgmt_del_event_callback(&mgmt_iface_cb);
#endif
}
if (count == 0) {
/* Network interface did not come up. We will not try
* to setup things in that case.
*/
NET_ERR("Timeout while waiting network %s", "interface");
return -ENETDOWN;
if (timeout > 0 && count < 0) {
NET_ERR("Timeout while waiting network %s",
"interface");
return -ENETDOWN;
}
}
setup_ipv4(iface);