projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
system-linux: check ioctl return value in system_if_flags()
[project/netifd.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index
1f23da0
..
649f2d1
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-30,12
+30,17
@@
struct alias_device {
char name[];
};
char name[];
};
-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
+57,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
);
}
}
}
}
@@
-107,7
+111,8
@@
static void alias_device_cb(struct device_user *dep, enum device_event ev)
}
static struct device *
}
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;
{
struct alias_device *alias;
@@
-118,7
+123,7
@@
alias_device_create(const char *name, struct blob_attr *attr)
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;
- device_init_virtual(&alias->dev,
&alias_device_
type, NULL);
+ device_init_virtual(&alias->dev,
dev
type, NULL);
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
alias->dep.alias = true;
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
alias->dep.alias = true;
@@
-156,7
+161,7
@@
static int alias_check_state(struct device *dev)
return 0;
}
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,
.name = "Network alias",
.create = alias_device_create,
.free = alias_device_free,
@@
-186,7
+191,7
@@
device_alias_get(const char *name)
if (alias)
return &alias->dev;
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)
}
static void __init alias_init(void)