[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
[DEV_ATTR_ENABLED] = { .name = "enabled", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_IPV6] = { .name = "ipv6", .type = BLOBMSG_TYPE_BOOL },
};
const struct uci_blob_param_list device_attr_list = {
static int set_device_state(struct device *dev, bool state)
{
+ if (dev->external)
+ return 0;
+
if (state)
system_if_up(dev);
else
memcpy(n->macaddr,
(s->flags & DEV_OPT_MACADDR ? s->macaddr : os->macaddr),
sizeof(n->macaddr));
+ n->ipv6 = s->flags & DEV_OPT_IPV6 ? s->ipv6 : os->ipv6;
n->flags = s->flags | os->flags;
}
}
}
+ if ((cur = tb[DEV_ATTR_IPV6])) {
+ s->ipv6 = blobmsg_get_bool(cur);
+ s->flags |= DEV_OPT_IPV6;
+ }
+
device_set_disabled(dev, disabled);
}
struct device_user *dep = container_of(list, struct device_user, list);
int *ev = ctx;
+ /* device might have been removed by an earlier callback */
+ if (!dep->dev)
+ return 0;
+
if (dep->cb)
dep->cb(dep, *ev);
return 0;
return;
device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
- if (!dep->hotplug)
+ if (!dev->external)
dev->set_state(dev, false);
device_broadcast_event(dev, DEV_EVENT_DOWN);
}
int device_check_state(struct device *dev)
{
if (!dev->type->check_state)
- return 0;
+ return simple_device_type.check_state(dev);
return dev->type->check_state(dev);
}
odev->current_config = true;
change = device_set_config(odev, type, config);
if (odev->external) {
- system_if_apply_settings(odev, &odev->settings);
+ system_if_apply_settings(odev, &odev->settings, odev->settings.flags);
change = DEV_CONFIG_APPLIED;
}
switch (change) {
blobmsg_add_string(b, "macaddr", format_macaddr(st.macaddr));
if (st.flags & DEV_OPT_TXQUEUELEN)
blobmsg_add_u32(b, "txqueuelen", st.txqueuelen);
+ if (st.flags & DEV_OPT_IPV6)
+ blobmsg_add_u8(b, "ipv6", st.ipv6);
}
s = blobmsg_open_table(b, "statistics");