.params = dev_attrs,
};
+static int __devlock = 0;
+
+void device_lock(void)
+{
+ __devlock++;
+}
+
+void device_unlock(void)
+{
+ __devlock--;
+ if (!__devlock)
+ device_free_unused(NULL);
+}
+
static struct device *
simple_device_create(const char *name, struct blob_attr *attr)
{
{
struct alias_device *alias;
+ device_lock();
+
alias = avl_find_element(&aliases, name, alias, avl);
if (!alias)
return;
alias->cleanup = !dev;
if (dev) {
if (dev != alias->dep.dev) {
- if (alias->dep.dev)
- device_remove_user(&alias->dep);
+ device_remove_user(&alias->dep);
strcpy(alias->dev.ifname, dev->ifname);
device_add_user(&alias->dep, dev);
}
if (!dev && alias->dep.dev && !alias->dep.dev->active)
device_remove_user(&alias->dep);
+
+ device_unlock();
}
static int set_device_state(struct device *dev, bool state)
}
static struct device *
-device_create_default(const char *name)
+device_create_default(const char *name, bool external)
{
struct device *dev;
D(DEVICE, "Create simple device '%s'\n", name);
dev = calloc(1, sizeof(*dev));
+ dev->external = external;
device_init(dev, &simple_device_type, name);
dev->default_config = true;
return dev;
}
struct device *
-device_get(const char *name, bool create)
+device_get(const char *name, int create)
{
struct device *dev;
if (!create)
return NULL;
- return device_create_default(name);
+ return device_create_default(name, create > 1);
}
static void
static void
__device_free_unused(struct device *dev)
{
- if (!list_empty(&dev->users) || dev->current_config || config_init)
+ if (!list_empty(&dev->users) || dev->current_config || __devlock)
return;
device_free(dev);
{
struct device *dev = dep->dev;
+ if (!dep->dev)
+ return;
+
+ dep->hotplug = false;
if (dep->claimed)
device_release(dep);
if (dev->type != &simple_device_type)
continue;
- ndev = device_create_default(dev->ifname);
+ ndev = device_create_default(dev->ifname, dev->external);
device_replace(ndev, dev);
}
}