projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
interface: report link up events for force_link interfaces
[project/netifd.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index
cef125f
..
56420c7
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-34,8
+34,15
@@
static const struct device_type alias_device_type;
static void alias_set_device(struct alias_device *alias, struct device *dev)
{
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;
return;
+ }
device_set_present(&alias->dev, false);
device_remove_user(&alias->new_dep);
device_set_present(&alias->dev, false);
device_remove_user(&alias->new_dep);
@@
-52,12
+59,11
@@
static void alias_set_device(struct alias_device *alias, struct device *dev)
alias->dev.hidden = !dev;
if (dev) {
device_set_ifindex(&alias->dev, dev->ifindex);
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 {
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
);
}
}
}
}
@@
-112,6
+118,9
@@
alias_device_create(const char *name, struct blob_attr *attr)
struct alias_device *alias;
alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
struct alias_device *alias;
alias = calloc(1, sizeof(*alias) + strlen(name) + 1);
+ if (!alias)
+ return NULL;
+
strcpy(alias->name, name);
alias->dev.set_state = alias_device_set_state;
alias->dev.hidden = true;
strcpy(alias->name, name);
alias->dev.set_state = alias_device_set_state;
alias->dev.hidden = true;
@@
-130,6
+139,8
@@
static void alias_device_free(struct device *dev)
struct alias_device *alias;
alias = container_of(dev, struct alias_device, dev);
struct alias_device *alias;
alias = container_of(dev, struct alias_device, dev);
+ device_remove_user(&alias->new_dep);
+ device_remove_user(&alias->dep);
avl_delete(&aliases, &alias->avl);
free(alias);
}
avl_delete(&aliases, &alias->avl);
free(alias);
}