When an interface goes down, the main_dev is reset to NULL.
Track an externally added device separately to be able to bring it back
up.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+interface_ext_cb(struct device_user *dep, enum device_event ev)
+{
+ if (ev == DEV_EVENT_REMOVE)
+ device_remove_user(dep);
+}
+
+static void
interface_cb(struct device_user *dep, enum device_event ev)
{
struct interface *iface;
interface_cb(struct device_user *dep, enum device_event ev)
{
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);
+ } else {
+ dev = iface->ext_dev.dev;
{
struct interface_user *dep, *tmp;
{
struct interface_user *dep, *tmp;
+ device_remove_user(&iface->ext_dev);
+
if (iface->parent_iface.iface)
interface_remove_user(&iface->parent_iface);
if (iface->parent_iface.iface)
interface_remove_user(&iface->parent_iface);
iface->config_ip.enabled = false;
iface->main_dev.cb = interface_cb;
iface->config_ip.enabled = false;
iface->main_dev.cb = interface_cb;
+ iface->ext_dev.cb = interface_ext_cb;
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
blob_data(config), blob_len(config));
if (mdev && mdev->hotplug_ops)
return mdev->hotplug_ops->del(mdev, dev);
if (mdev && mdev->hotplug_ops)
return mdev->hotplug_ops->del(mdev, dev);
+ if (dev == iface->ext_dev.dev)
+ device_remove_user(&iface->ext_dev);
+
if (!iface->main_dev.hotplug)
return UBUS_STATUS_INVALID_ARGUMENT;
if (!iface->main_dev.hotplug)
return UBUS_STATUS_INVALID_ARGUMENT;
return UBUS_STATUS_NOT_SUPPORTED;
}
return UBUS_STATUS_NOT_SUPPORTED;
}
+ device_add_user(&iface->ext_dev, dev);
interface_set_main_dev(iface, dev);
iface->main_dev.hotplug = true;
return 0;
interface_set_main_dev(iface, dev);
iface->main_dev.hotplug = true;
return 0;
/* main interface that the interface is bound to */
struct device_user main_dev;
/* main interface that the interface is bound to */
struct device_user main_dev;
+ struct device_user ext_dev;
/* interface that layer 3 communication will go through */
struct device_user l3_dev;
/* interface that layer 3 communication will go through */
struct device_user l3_dev;