X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=45432506eedc89dbfe8ba17e6f7e76675c95592a;hp=35f20b087fdee2906296cb29cbbf65045a34d9ea;hb=9af0e57ce2c76db2ce49ea9fbfb5766da6000ec6;hpb=b2dcb02570939d98b92c7c55db1c328693a5d52a

diff --git a/interface.c b/interface.c
index 35f20b0..4543250 100644
--- a/interface.c
+++ b/interface.c
@@ -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);