projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake: bump the minimum required CMake version to 3.5
[project/netifd.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index 56420c7be27bb33a2bb4a36c7bfe8d12f06d9cc5..98d54100fef9294eae187275b934850a3a054098 100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-30,8
+30,6
@@
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)
{
if (dev == alias->dep.dev) {
static void alias_set_device(struct alias_device *alias, struct device *dev)
{
if (dev == alias->dep.dev) {
@@
-89,19
+87,20
@@
alias_device_set_state(struct device *dev, bool state)
static void alias_device_cb(struct device_user *dep, enum device_event ev)
{
struct alias_device *alias;
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:
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:
case DEV_EVENT_REMOVE:
- device_set_present(&alias->dev,
new_stat
e);
+ device_set_present(&alias->dev,
fals
e);
break;
case DEV_EVENT_LINK_UP:
break;
case DEV_EVENT_LINK_UP:
- new_state = true;
+ device_set_link(&alias->dev, true);
+ break;
case DEV_EVENT_LINK_DOWN:
case DEV_EVENT_LINK_DOWN:
- device_set_link(&alias->dev,
new_stat
e);
+ device_set_link(&alias->dev,
fals
e);
break;
case DEV_EVENT_UPDATE_IFINDEX:
device_set_ifindex(&alias->dev, dep->dev->ifindex);
break;
case DEV_EVENT_UPDATE_IFINDEX:
device_set_ifindex(&alias->dev, dep->dev->ifindex);
@@
-113,7
+112,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;
@@
-124,7
+124,11
@@
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);
+ 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;
alias->avl.key = alias->name;
avl_insert(&aliases, &alias->avl);
alias->dep.alias = true;
@@
-162,7
+166,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,
@@
-174,13
+178,9
@@
alias_notify_device(const char *name, struct device *dev)
{
struct alias_device *alias;
{
struct alias_device *alias;
- device_lock();
-
alias = avl_find_element(&aliases, name, alias, avl);
if (alias)
alias_set_device(alias, dev);
alias = avl_find_element(&aliases, name, alias, avl);
if (alias)
alias_set_device(alias, dev);
-
- device_unlock();
}
struct device *
}
struct device *
@@
-192,7
+192,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)