X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=54638e7c25fb7e1bb85886ebbb8ff4886c0bb368;hp=f50fb8505e1b7653659d63ffb895cbf3f2421b98;hb=500779b3750d8a7603401128f6eb4e942e684616;hpb=b9d1f678c1f705b5635de31d333353a64ff6799d

diff --git a/device.c b/device.c
index f50fb85..54638e7 100644
--- a/device.c
+++ b/device.c
@@ -631,16 +631,20 @@ device_apply_config(struct device *dev, const struct device_type *type,
 		case DEV_CONFIG_RESTART:
 		case DEV_CONFIG_APPLIED:
 			D(DEVICE, "Device '%s': config applied\n", dev->ifname);
+			config = blob_memdup(config);
 			free(dev->config);
 			dev->config = config;
 			if (change == DEV_CONFIG_RESTART && dev->present) {
 				device_set_present(dev, false);
+				if (dev->active && !dev->external) {
+					dev->set_state(dev, false);
+					dev->set_state(dev, true);
+				}
 				device_set_present(dev, true);
 			}
 			break;
 		case DEV_CONFIG_NO_CHANGE:
 			D(DEVICE, "Device '%s': no configuration change\n", dev->ifname);
-			free(config);
 			break;
 		case DEV_CONFIG_RECREATE:
 			break;
@@ -703,10 +707,6 @@ device_create(const char *name, const struct device_type *type,
 	struct device *odev = NULL, *dev;
 	enum dev_change_type change;
 
-	config = blob_memdup(config);
-	if (!config)
-		return NULL;
-
 	odev = device_get(name, false);
 	if (odev) {
 		odev->current_config = true;
@@ -722,6 +722,10 @@ device_create(const char *name, const struct device_type *type,
 	} else
 		D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
 
+	config = blob_memdup(config);
+	if (!config)
+		return NULL;
+
 	dev = type->create(name, config);
 	if (!dev)
 		return NULL;