X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=35f20b087fdee2906296cb29cbbf65045a34d9ea;hp=ed6095936700e0cd35c4c91779822bd73769f5e2;hb=b2dcb02570939d98b92c7c55db1c328693a5d52a;hpb=75e73ab3714e324bf98140dbbf740d3e4c40f044;ds=sidebyside

diff --git a/interface.c b/interface.c
index ed60959..35f20b0 100644
--- a/interface.c
+++ b/interface.c
@@ -272,11 +272,14 @@ interface_check_state(struct interface *iface)
 	switch (iface->state) {
 	case IFS_UP:
 		if (!iface->enabled || !link_state) {
-			mark_interface_down(iface);
 			interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+			mark_interface_down(iface);
 		}
 		break;
 	case IFS_DOWN:
+		if (!iface->available)
+			return;
+
 		if (iface->autostart && iface->enabled && link_state && !config_init)
 			__interface_set_up(iface);
 		break;
@@ -527,6 +530,7 @@ interface_cleanup(struct interface *iface)
 {
 	struct interface_user *dep, *tmp;
 
+	uloop_timeout_cancel(&iface->remove_timer);
 	device_remove_user(&iface->ext_dev);
 
 	if (iface->parent_iface.iface)
@@ -835,8 +839,8 @@ interface_remove_link(struct interface *iface, struct device *dev)
 	return 0;
 }
 
-int
-interface_add_link(struct interface *iface, struct device *dev)
+static int
+interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
 {
 	struct device *mdev = iface->main_dev.dev;
 
@@ -853,21 +857,23 @@ interface_add_link(struct interface *iface, struct device *dev)
 			return UBUS_STATUS_NOT_SUPPORTED;
 	}
 
-	device_add_user(&iface->ext_dev, dev);
+	if (link_ext)
+		device_add_user(&iface->ext_dev, dev);
+
 	interface_set_main_dev(iface, dev);
 	iface->main_dev.hotplug = true;
 	return 0;
 }
 
 int
-interface_handle_link(struct interface *iface, const char *name, bool add)
+interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext)
 {
 	struct device *dev;
 	int ret;
 
 	device_lock();
 
-	dev = device_get(name, add ? 2 : 0);
+	dev = device_get(name, add ? (link_ext ? 2 : 1) : 0);
 	if (!dev) {
 		ret = UBUS_STATUS_NOT_FOUND;
 		goto out;
@@ -879,7 +885,7 @@ interface_handle_link(struct interface *iface, const char *name, bool add)
 			device_set_config(dev, &simple_device_type, iface->config);
 
 		system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
-		ret = interface_add_link(iface, dev);
+		ret = interface_add_link(iface, dev, link_ext);
 	} else {
 		ret = interface_remove_link(iface, dev);
 	}