Change IP reloading order

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index a697326..96f8e6d 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -588,8 +588,12 @@ interface_init(struct interface *iface, const char *name,
        }
 
        // Set a default exteranl routing table for IPv6 to do source-based-filtering
+       struct interface *iface_old = vlist_find(&interfaces, name, iface_old, node);
+       if (iface_old && iface_old->ip6table > 1000 && iface_old->ip6table < 2000)
+               iface->ip6table = iface_old->ip6table;
+       else
+               iface->ip6table = 1000 + ++interface_serial;
 
-       iface->ip6table = 1000 + ++interface_serial;
        if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
                if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
                        DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
@@ -870,9 +874,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 
        if (reload_ip) {
                interface_ip_set_enabled(&if_old->config_ip, false);
-               interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled);
                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_write_resolv_conf();