X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=c30650abd844f19e71f4b2dfa4fab01a0fe331eb;hp=1c0736f67ce05260d5c1d3800f6bd52dec4140fd;hb=ddbd2cc51b3db14f6a8bd46ceebaee9097a50b78;hpb=b35fd5d5788184f685520352962f1a727ea91c1e

diff --git a/device.c b/device.c
index 1c0736f..c30650a 100644
--- a/device.c
+++ b/device.c
@@ -39,7 +39,7 @@ static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
 	[DEV_ATTR_ENABLED] = { "enabled", BLOBMSG_TYPE_BOOL },
 };
 
-const struct config_param_list device_attr_list = {
+const struct uci_blob_param_list device_attr_list = {
 	.n_params = __DEV_ATTR_MAX,
 	.params = dev_attrs,
 };
@@ -216,7 +216,7 @@ int device_claim(struct device_user *dep)
 	if (ret == 0)
 		device_broadcast_event(dev, DEV_EVENT_UP);
 	else {
-		D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
+		D(DEVICE, "claim %s %s failed: %d\n", dev->type->name, dev->ifname, ret);
 		dev->active = 0;
 		dep->claimed = false;
 	}
@@ -408,6 +408,9 @@ void device_add_user(struct device_user *dep, struct device *dev)
 {
 	struct safe_list *head;
 
+	if (dep->dev == dev)
+		return;
+
 	if (dep->dev)
 		device_remove_user(dep);
 
@@ -499,9 +502,9 @@ static enum dev_change_type
 device_reload_config(struct device *dev, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__DEV_ATTR_MAX];
-	const struct config_param_list *cfg = dev->type->config_params;
+	const struct uci_blob_param_list *cfg = dev->type->config_params;
 
-	if (config_check_equal(dev->config, attr, cfg))
+	if (uci_blob_check_equal(dev->config, attr, cfg))
 		return DEV_CONFIG_NO_CHANGE;
 
 	if (cfg == &device_attr_list) {
@@ -584,7 +587,7 @@ device_create(const char *name, const struct device_type *type,
 	struct device *odev = NULL, *dev;
 	enum dev_change_type change;
 
-	config = config_memdup(config);
+	config = blob_memdup(config);
 	if (!config)
 		return NULL;