projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: make link status detection optional for vlan devices
[project/netifd.git]
/
interface.c
diff --git
a/interface.c
b/interface.c
index
df04ce3
..
4543250
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-272,11
+272,14
@@
interface_check_state(struct interface *iface)
switch (iface->state) {
case IFS_UP:
if (!iface->enabled || !link_state) {
switch (iface->state) {
case IFS_UP:
if (!iface->enabled || !link_state) {
- mark_interface_down(iface);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+ mark_interface_down(iface);
}
break;
case IFS_DOWN:
}
break;
case IFS_DOWN:
+ if (!iface->available)
+ return;
+
if (iface->autostart && iface->enabled && link_state && !config_init)
__interface_set_up(iface);
break;
if (iface->autostart && iface->enabled && link_state && !config_init)
__interface_set_up(iface);
break;
@@
-498,6
+501,8
@@
interface_claim_device(struct interface *iface)
} else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
} else if (iface->ifname &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
dev = device_get(iface->ifname, true);
+ if (dev && dev->default_config && iface->device_config)
+ device_set_config(dev, dev->type, iface->config);
} else {
dev = iface->ext_dev.dev;
}
} else {
dev = iface->ext_dev.dev;
}
@@
-878,8
+883,8
@@
interface_handle_link(struct interface *iface, const char *name, bool add, bool
if (add) {
device_set_present(dev, true);
if (add) {
device_set_present(dev, true);
- if (iface->device_config)
- device_set_config(dev,
&simple_device_
type, iface->config);
+ if (iface->device_config
&& dev->default_config
)
+ device_set_config(dev,
dev->
type, iface->config);
system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
ret = interface_add_link(iface, dev, link_ext);
system_if_apply_settings(dev, &dev->settings, dev->settings.flags);
ret = interface_add_link(iface, dev, link_ext);