char name[];
};
-static const struct device_type alias_device_type;
-
static void alias_set_device(struct alias_device *alias, struct device *dev)
{
- if (dev == alias->dep.dev)
+ if (dev == alias->dep.dev) {
+ if (alias->update) {
+ device_remove_user(&alias->new_dep);
+ alias->update = false;
+ if (dev)
+ device_set_present(&alias->dev, true);
+ }
return;
+ }
device_set_present(&alias->dev, false);
device_remove_user(&alias->new_dep);
alias->dev.hidden = !dev;
if (dev) {
device_set_ifindex(&alias->dev, dev->ifindex);
- strcpy(alias->dev.ifname, dev->ifname);
- device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+ device_set_ifname(&alias->dev, dev->ifname);
device_add_user(&alias->dep, dev);
} else {
- alias->dev.ifname[0] = 0;
- device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+ device_set_ifname(&alias->dev, "");
+ device_set_link(&alias->dev, false);
}
}
static void alias_device_cb(struct device_user *dep, enum device_event ev)
{
struct alias_device *alias;
- bool new_state = false;
alias = container_of(dep, struct alias_device, dep);
switch (ev) {
case DEV_EVENT_ADD:
- new_state = true;
+ device_set_present(&alias->dev, true);
+ break;
case DEV_EVENT_REMOVE:
- device_set_present(&alias->dev, new_state);
+ device_set_present(&alias->dev, false);
break;
case DEV_EVENT_LINK_UP:
- new_state = true;
+ device_set_link(&alias->dev, true);
+ break;
case DEV_EVENT_LINK_DOWN:
- device_set_link(&alias->dev, new_state);
+ device_set_link(&alias->dev, false);
break;
case DEV_EVENT_UPDATE_IFINDEX:
device_set_ifindex(&alias->dev, dep->dev->ifindex);
}
static struct device *
-alias_device_create(const char *name, struct blob_attr *attr)
+alias_device_create(const char *name, struct device_type *devtype,
+ struct blob_attr *attr)
{
struct alias_device *alias;
strcpy(alias->name, name);
alias->dev.set_state = alias_device_set_state;
alias->dev.hidden = true;
- device_init_virtual(&alias->dev, &alias_device_type, NULL);
+ if (device_init_virtual(&alias->dev, devtype, NULL) < 0) {
+ free(alias);
+ return NULL;
+ }
+
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
alias->dep.alias = true;
return 0;
}
-static const struct device_type alias_device_type = {
+static struct device_type alias_device_type = {
.name = "Network alias",
.create = alias_device_create,
.free = alias_device_free,
{
struct alias_device *alias;
- device_lock();
-
alias = avl_find_element(&aliases, name, alias, avl);
if (alias)
alias_set_device(alias, dev);
-
- device_unlock();
}
struct device *
if (alias)
return &alias->dev;
- return alias_device_create(name, NULL);
+ return alias_device_create(name, &alias_device_type, NULL);
}
static void __init alias_init(void)