projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ifname for alias+vlan chains
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
017fe03
..
cc41b20
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-163,6
+163,7
@@
alias_device_create(const char *name, struct blob_attr *attr)
alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
strcpy(alias->name, name);
alias->dev.set_state = alias_device_set_state;
alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
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);
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
device_init_virtual(&alias->dev, &alias_device_type, NULL);
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
@@
-269,13
+270,19
@@
alias_notify_device(const char *name, struct device *dev)
device_remove_user(&alias->dep);
strcpy(alias->dev.ifname, dev->ifname);
device_add_user(&alias->dep, dev);
device_remove_user(&alias->dep);
strcpy(alias->dev.ifname, dev->ifname);
device_add_user(&alias->dep, dev);
+ alias->dev.hidden = false;
+ device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
}
}
device_set_present(&alias->dev, !!dev);
}
}
device_set_present(&alias->dev, !!dev);
- if (!dev && alias->dep.dev && !alias->dep.dev->active)
+ if (!dev && alias->dep.dev && !alias->dep.dev->active)
{
device_remove_user(&alias->dep);
device_remove_user(&alias->dep);
+ alias->dev.hidden = true;
+ alias->dev.ifname[0] = 0;
+ device_broadcast_event(&alias->dev, DEV_EVENT_UPDATE_IFNAME);
+ }
device_unlock();
}
device_unlock();
}