properly flush routes and l3 devices when tearing down interfaces

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 6e3feeb..4ad89f5 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -120,6 +120,8 @@ __interface_set_down(struct interface *iface, bool force)
        if (iface->state == IFS_UP)
                interface_event(iface, IFEV_DOWN);
        iface->state = IFS_TEARDOWN;
+       interface_ip_flush(&iface->config_ip);
+       interface_ip_flush(&iface->proto_ip);
        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
        if (force)
                interface_flush_state(iface);
@@ -349,7 +351,7 @@ interface_add(struct interface *iface, struct blob_attr *config)
                iface->ifname = blobmsg_data(cur);
 
        iface->config = config;
-       vlist_add(&interfaces, &iface->node);
+       vlist_add(&interfaces, &iface->node, iface->name);
 }
 
 int
@@ -553,8 +555,7 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new,
 static void __init
 interface_init_list(void)
 {
-       vlist_init(&interfaces, avl_strcmp, interface_update,
-                  struct interface, node, name);
+       vlist_init(&interfaces, avl_strcmp, interface_update);
        interfaces.keep_old = true;
        interfaces.no_delete = true;
 }