netifd: Fix interface auto disable when doing network reload

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 4543250..4b5405e 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -1015,8 +1015,12 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        })
 
        if_old->config = if_new->config;
-       if (!if_old->config_autostart && if_new->config_autostart)
-               if_old->autostart = true;
+       if (if_old->config_autostart != if_new->config_autostart) {
+               if (if_old->config_autostart)
+                       reload = true;
+
+               if_old->autostart = if_new->config_autostart;
+       }
 
        if_old->device_config = if_new->device_config;
        if_old->config_autostart = if_new->config_autostart;
@@ -1045,10 +1049,13 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        }
 
        if (reload_ip) {
+               bool config_ip_enabled = if_old->config_ip.enabled;
+               bool proto_ip_enabled = if_old->proto_ip.enabled;
+
                interface_ip_set_enabled(&if_old->config_ip, false);
                interface_ip_set_enabled(&if_old->proto_ip, false);
-               interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled);
-               interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
+               interface_ip_set_enabled(&if_old->proto_ip, proto_ip_enabled);
+               interface_ip_set_enabled(&if_old->config_ip, config_ip_enabled);
        }
 
        interface_write_resolv_conf();