static void
-interface_cleanup(struct interface *iface)
+interface_cleanup(struct interface *iface, bool reload)
{
struct interface_user *dep, *tmp;
interface_ip_flush(&iface->config_ip);
interface_flush_state(iface);
interface_clear_errors(iface);
- if (iface->main_dev.dev)
+ if (iface->main_dev.dev &&
+ (!reload || !iface->main_dev.hotplug))
device_remove_user(&iface->main_dev);
iface->l3_dev = &iface->main_dev;
interface_set_proto_state(iface, NULL);
static void
interface_do_free(struct interface *iface)
{
- interface_cleanup(iface);
+ interface_cleanup(iface, false);
free(iface->config);
netifd_ubus_remove_interface(iface);
avl_delete(&interfaces.avl, &iface->node.avl);
static void
interface_do_reload(struct interface *iface)
{
- interface_cleanup(iface);
+ interface_cleanup(iface, true);
proto_init_interface(iface, iface->config);
interface_claim_device(iface);
}
iface->ifname = blobmsg_data(cur);
iface->config = config;
- vlist_add(&interfaces, &iface->node);
+ vlist_add(&interfaces, &iface->node, iface->name);
}
int
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;
}