From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 5 Oct 2011 23:30:47 +0000 (+0200)
Subject: recreate devices if the type does not match
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ce15904743529fc38d1bb2fc78bf559db98fe3b;p=oweals%2Fnetifd.git

recreate devices if the type does not match
---

diff --git a/device.c b/device.c
index 42b78e3..ce6f175 100644
--- a/device.c
+++ b/device.c
@@ -222,6 +222,7 @@ struct device *device_get(const char *name, bool create)
 	if (!create)
 		return NULL;
 
+	D(DEVICE, "Create simple device '%s'\n", name);
 	dev = calloc(1, sizeof(*dev));
 	device_init(dev, &simple_device_type, name);
 
@@ -234,6 +235,7 @@ device_delete(struct device *dev)
 	if (!dev->avl.key)
 		return;
 
+	D(DEVICE, "Delete device '%s' from list\n", dev->ifname);
 	avl_delete(&devices, &dev->avl);
 	dev->avl.key = NULL;
 }
@@ -342,8 +344,12 @@ device_reload_config(struct device *dev, struct blob_attr *attr)
 }
 
 static enum dev_change_type
-device_check_config(struct device *dev, struct blob_attr *attr)
+device_check_config(struct device *dev, const struct device_type *type,
+		    struct blob_attr *attr)
 {
+	if (type != dev->type)
+		return DEV_CONFIG_RECREATE;
+
 	if (dev->type->reload)
 		return dev->type->reload(dev, attr);
 
@@ -383,7 +389,7 @@ device_create(const char *name, const struct device_type *type,
 
 	odev = device_get(name, false);
 	if (odev) {
-		change = device_check_config(odev, config);
+		change = device_check_config(odev, type, config);
 		switch (change) {
 		case DEV_CONFIG_APPLIED:
 			D(DEVICE, "Device '%s': config applied\n", odev->ifname);