projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore mac80211 devices specified in /etc/config/network
[project/netifd.git]
/
device.c
diff --git
a/device.c
b/device.c
index
b6f4725
..
a2d5637
100644
(file)
--- a/
device.c
+++ b/
device.c
@@
-374,6
+374,9
@@
device_create_default(const char *name, bool external)
{
struct device *dev;
{
struct device *dev;
+ if (!external && system_if_force_external(name))
+ return NULL;
+
D(DEVICE, "Create simple device '%s'\n", name);
dev = calloc(1, sizeof(*dev));
dev->external = external;
D(DEVICE, "Create simple device '%s'\n", name);
dev = calloc(1, sizeof(*dev));
dev->external = external;
@@
-452,26
+455,25
@@
static void __device_set_present(struct device *dev, bool state)
device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
}
device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
}
-void device_set_present(struct device *dev, bool state)
+void
+device_refresh_present(struct device *dev)
{
{
- if (dev->sys_present == state)
- return;
+ bool state = dev->sys_present;
- dev->sys_present = state;
- D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
-
- if (state && dev->disabled)
- return;
+ if (dev->disabled || dev->deferred)
+ state = false;
__device_set_present(dev, state);
}
__device_set_present(dev, state);
}
-void
-device_set_disabled(struct device *dev, bool value)
+void device_set_present(struct device *dev, bool state)
{
{
- dev->disabled = value;
- if (dev->sys_present)
- __device_set_present(dev, !value);
+ if (dev->sys_present == state)
+ return;
+
+ D(DEVICE, "%s '%s' %s present\n", dev->type->name, dev->ifname, state ? "is now" : "is no longer" );
+ dev->sys_present = state;
+ device_refresh_present(dev);
}
void device_add_user(struct device_user *dep, struct device *dev)
}
void device_add_user(struct device_user *dep, struct device *dev)
@@
-704,10
+706,13
@@
device_dump_status(struct blob_buf *b, struct device *dev)
return;
}
return;
}
+ blobmsg_add_u8(b, "external", dev->external);
+ blobmsg_add_u8(b, "present", dev->present);
+ blobmsg_add_string(b, "type", dev->type->name);
+
if (!dev->present)
return;
if (!dev->present)
return;
- blobmsg_add_string(b, "type", dev->type->name);
blobmsg_add_u8(b, "up", !!dev->active);
if (dev->type->dump_info)
dev->type->dump_info(dev, b);
blobmsg_add_u8(b, "up", !!dev->active);
if (dev->type->dump_info)
dev->type->dump_info(dev, b);