ret = dev->set_state(dev, true);
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
- else
+ else {
+ D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
dev->active = 0;
+ dep->claimed = false;
+ }
return ret;
}
continue;
dep->cb(dep, DEV_EVENT_REMOVE);
+ device_release(dep);
}
device_delete(dev);
static void
__device_free_unused(struct device *dev)
{
- if (!list_empty(&dev->users) || dev->current_config)
+ if (!list_empty(&dev->users) || dev->current_config || config_init)
return;
device_free(dev);
enum dev_change_type
device_reload_config(struct device *dev, struct blob_attr *attr)
{
- struct blob_attr *tb[__DEV_ATTR_MAX], *tb1[__DEV_ATTR_MAX];
-
- blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
- blob_data(attr), blob_len(attr));
- if (dev->config)
- blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb1,
- blob_data(dev->config), blob_len(dev->config));
- else
- memset(tb1, 0, sizeof(tb1));
+ struct blob_attr *tb[__DEV_ATTR_MAX];
+ const struct config_param_list *cfg = dev->type->config_params;
- if (!config_diff(tb, tb1, &device_attr_list, NULL))
+ if (config_check_equal(dev->config, attr, cfg))
return DEV_CONFIG_NO_CHANGE;
- device_init_settings(dev, tb);
- return DEV_CONFIG_APPLIED;
+ if (cfg == &device_attr_list) {
+ memset(tb, 0, sizeof(tb));
+
+ if (dev->config)
+ blobmsg_parse(dev_attrs, __DEV_ATTR_MAX, tb,
+ blob_data(attr), blob_len(attr));
+
+ device_init_settings(dev, tb);
+ return DEV_CONFIG_APPLIED;
+ } else
+ return DEV_CONFIG_RECREATE;
}
static enum dev_change_type
device_set_present(odev, false);
list_for_each_entry_safe(dep, tmp, &odev->users, list) {
- device_remove_user(dep);
- device_add_user(dep, dev);
+ device_release(dep);
+ list_move_tail(&dep->list, &dev->users);
+ dep->dev = dev;
}
device_free(odev);
struct device *odev = NULL, *dev;
enum dev_change_type change;
- D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
config = config_memdup(config);
if (!config)
return NULL;
device_set_present(odev, false);
device_set_present(odev, true);
}
- free(config);
return odev;
case DEV_CONFIG_NO_CHANGE:
D(DEVICE, "Device '%s': no configuration change\n", odev->ifname);
device_delete(odev);
break;
}
- }
+ } else
+ D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
dev = type->create(config);
if (!dev)