X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=1d842cf8e085fcd28081823aaa70c06cd6ae4e93;hp=8f0e823373e75e27eeb53f656a122f393fa0d34a;hb=414195df0ba6046cee387517d13d77e2f4d92fec;hpb=f5f78c1eca1fe2df04dae56a4d9f024533066b29

diff --git a/device.c b/device.c
index 8f0e823..1d842cf 100644
--- a/device.c
+++ b/device.c
@@ -312,7 +312,8 @@ void device_release(struct device_user *dep)
 		return;
 
 	device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-	dev->set_state(dev, false);
+	if (!dep->hotplug)
+		dev->set_state(dev, false);
 	device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -553,7 +554,7 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
 				blob_data(attr), blob_len(attr));
 
 		device_init_settings(dev, tb);
-		return DEV_CONFIG_APPLIED;
+		return DEV_CONFIG_RESTART;
 	} else
 		return DEV_CONFIG_RECREATE;
 }
@@ -633,11 +634,12 @@ device_create(const char *name, const struct device_type *type,
 		odev->current_config = true;
 		change = device_set_config(odev, type, config);
 		switch (change) {
+		case DEV_CONFIG_RESTART:
 		case DEV_CONFIG_APPLIED:
 			D(DEVICE, "Device '%s': config applied\n", odev->ifname);
 			free(odev->config);
 			odev->config = config;
-			if (odev->present) {
+			if (change == DEV_CONFIG_RESTART && odev->present) {
 				device_set_present(odev, false);
 				device_set_present(odev, true);
 			}