projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delay bringup of interfaces until after the config reload
[project/netifd.git]
/
interface.c
diff --git
a/interface.c
b/interface.c
index
506a478
..
eb2f754
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-31,7
+31,7
@@
const struct config_param_list interface_attr_list = {
};
static void
};
static void
-
clear_interface
_errors(struct interface *iface)
+
interface_clear
_errors(struct interface *iface)
{
struct interface_error *error, *tmp;
{
struct interface_error *error, *tmp;
@@
-119,7
+119,7
@@
__interface_set_up(struct interface *iface)
static void
__interface_set_down(struct interface *iface, bool force)
{
static void
__interface_set_down(struct interface *iface, bool force)
{
-
clear_interface
_errors(iface);
+
interface_clear
_errors(iface);
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
if (iface->state == IFS_DOWN ||
iface->state == IFS_TEARDOWN)
@@
-184,6
+184,7
@@
interface_claim_device(struct interface *iface)
static void
interface_cleanup(struct interface *iface)
{
static void
interface_cleanup(struct interface *iface)
{
+ interface_clear_errors(iface);
if (iface->main_dev.dev)
device_remove_user(&iface->main_dev);
interface_set_proto_state(iface, NULL);
if (iface->main_dev.dev)
device_remove_user(&iface->main_dev);
interface_set_proto_state(iface, NULL);
@@
-206,7
+207,7
@@
interface_do_reload(struct interface *iface)
interface_claim_device(iface);
proto_init_interface(iface, iface->config);
interface_claim_device(iface);
proto_init_interface(iface, iface->config);
- if (iface->autostart)
+ if (iface->autostart
&& !config_init
)
interface_set_up(iface);
}
interface_set_up(iface);
}
@@
-400,6
+401,7
@@
interface_change_config(struct interface *if_old, struct interface *if_new)
{
struct blob_attr *old_config = if_old->config;
{
struct blob_attr *old_config = if_old->config;
+ interface_clear_errors(if_old);
if_old->config = if_new->config;
if (!if_old->config_autostart && if_new->config_autostart)
if_old->autostart = true;
if_old->config = if_new->config;
if (!if_old->config_autostart && if_new->config_autostart)
if_old->autostart = true;