X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=45432506eedc89dbfe8ba17e6f7e76675c95592a;hp=bebc30be9275ca5f78cd096c2daac8a20c41b1e6;hb=5a4eb870afc69e9fa93fdccb8a42f75e8e357f4e;hpb=b8e21616bcb422dac93ba6a3e5f4b4e78b4b30db

diff --git a/interface.c b/interface.c
index bebc30b..4543250 100644
--- a/interface.c
+++ b/interface.c
@@ -272,8 +272,8 @@ 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:
@@ -501,6 +501,8 @@ interface_claim_device(struct interface *iface)
 	} else if (iface->ifname &&
 		!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
 		dev = device_get(iface->ifname, true);
+		if (dev && dev->default_config && iface->device_config)
+			device_set_config(dev, dev->type, iface->config);
 	} else {
 		dev = iface->ext_dev.dev;
 	}
@@ -881,8 +883,8 @@ interface_handle_link(struct interface *iface, const char *name, bool add, bool
 
 	if (add) {
 		device_set_present(dev, true);
-		if (iface->device_config)
-			device_set_config(dev, &simple_device_type, iface->config);
+		if (iface->device_config && dev->default_config)
+			device_set_config(dev, dev->type, iface->config);
 
 		system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
 		ret = interface_add_link(iface, dev, link_ext);