X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=1d842cf8e085fcd28081823aaa70c06cd6ae4e93;hp=489c6601de8dfe076436a29615fe2ca7d70a5354;hb=f4c907480f85faa88dbf19270bb8f02d7b15d6f1;hpb=93ddba72304f8267f8ca63dce2235a154227cd99

diff --git a/device.c b/device.c
index 489c660..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);
 }
 
@@ -465,6 +466,9 @@ device_set_disabled(struct device *dev, bool value)
 
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+	if (dep->dev)
+		device_remove_user(dep);
+
 	dep->dev = dev;
 	list_add_tail(&dep->list, &dev->users);
 	if (dep->cb && dev->present) {
@@ -550,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;
 }
@@ -630,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);
 			}