return vlan;
}
+static struct bridge_vlan_hotplug_port *
+bridge_hotplug_get_vlan_port(struct bridge_vlan *vlan, const char *ifname)
+{
+ struct bridge_vlan_hotplug_port *port;
+
+ list_for_each_entry(port, &vlan->hotplug_ports, list)
+ if (!strcmp(port->port.ifname, ifname))
+ return port;
+
+ return NULL;
+}
+
static void
-bridge_hotplug_create_member_vlans(struct bridge_state *bst, struct blob_attr *vlans, const char *ifname)
+bridge_hotplug_set_member_vlans(struct bridge_state *bst, struct blob_attr *vlans,
+ const char *ifname, struct bridge_member *bm, bool add)
{
struct bridge_vlan *vlan;
struct blob_attr *cur;
}
}
+ port = bridge_hotplug_get_vlan_port(vlan, ifname);
+ if (!add) {
+ if (!port)
+ continue;
+
+ __bridge_set_member_vlan(bm, vlan, &port->port, false);
+ list_del(&port->list);
+ free(port);
+ continue;
+ }
+
+ if (port) {
+ if (port->port.flags == flags)
+ continue;
+
+ __bridge_set_member_vlan(bm, vlan, &port->port, false);
+ port->port.flags = flags;
+ __bridge_set_member_vlan(bm, vlan, &port->port, true);
+ continue;
+ }
+
port = calloc_a(sizeof(*port), &name_buf, strlen(ifname) + 1);
if (!port)
continue;
port->port.flags = flags;
port->port.ifname = strcpy(name_buf, ifname);
list_add_tail(&port->list, &vlan->hotplug_ports);
+
+ if (!bm)
+ continue;
+
+ __bridge_set_member_vlan(bm, vlan, &port->port, true);
}
}
bridge_hotplug_add(struct device *dev, struct device *member, struct blob_attr *vlan)
{
struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
+ struct bridge_member *bm;
- bridge_hotplug_create_member_vlans(bst, vlan, member->ifname);
- bridge_create_member(bst, member->ifname, member, true);
+ bm = vlist_find(&bst->members, member->ifname, bm, node);
+ bridge_hotplug_set_member_vlans(bst, vlan, member->ifname, bm, true);
+ if (!bm)
+ bridge_create_member(bst, member->ifname, member, true);
return 0;
}
static int
-bridge_hotplug_del(struct device *dev, struct device *member)
+bridge_hotplug_del(struct device *dev, struct device *member, struct blob_attr *vlan)
{
struct bridge_state *bst = container_of(dev, struct bridge_state, dev);
struct bridge_member *bm;
if (!bm)
return UBUS_STATUS_NOT_FOUND;
+ bridge_hotplug_set_member_vlans(bst, vlan, member->ifname, bm, false);
+ if (!bm->dev.hotplug)
+ return 0;
+
vlist_delete(&bst->members, &bm->node);
return 0;
}
struct device_hotplug_ops {
int (*prepare)(struct device *dev, struct device **bridge_dev);
int (*add)(struct device *main, struct device *member, struct blob_attr *vlan);
- int (*del)(struct device *main, struct device *member);
+ int (*del)(struct device *main, struct device *member, struct blob_attr *vlan);
};
enum bridge_vlan_flags {
}
static int
-extdev_hotplug_remove(struct device *dev, struct device *member)
+extdev_hotplug_remove(struct device *dev, struct device *member, struct blob_attr *vlan)
{
struct extdev_bridge *ebr;
struct extdev_bridge_member *ubm;
}
static int
-interface_remove_link(struct interface *iface, struct device *dev)
+interface_remove_link(struct interface *iface, struct device *dev,
+ struct blob_attr *vlan)
{
struct device *mdev = iface->main_dev.dev;
if (mdev && mdev->hotplug_ops)
- return mdev->hotplug_ops->del(mdev, dev);
+ return mdev->hotplug_ops->del(mdev, dev, vlan);
if (dev == iface->ext_dev.dev)
device_remove_user(&iface->ext_dev);
ret = interface_add_link(iface, dev, vlan, link_ext);
} else {
- ret = interface_remove_link(iface, dev);
+ ret = interface_remove_link(iface, dev, vlan);
}
out:
}
static int
-vlan_hotplug_add(struct device *dev, struct device *member, struct blob_attr *vlan)
+__vlan_hotplug_op(struct device *dev, struct device *member, struct blob_attr *vlan, bool add)
{
struct vlan_device *vldev = container_of(dev, struct vlan_device, dev);
void *a;
blobmsg_printf(&b, NULL, "%d", vldev->id);
blobmsg_close_array(&b, a);
- return dev->hotplug_ops->add(dev, member, blobmsg_data(b.head));
+ if (add)
+ return dev->hotplug_ops->add(dev, member, blobmsg_data(b.head));
+ else
+ return dev->hotplug_ops->del(dev, member, blobmsg_data(b.head));
}
static int
-vlan_hotplug_del(struct device *dev, struct device *member)
+vlan_hotplug_add(struct device *dev, struct device *member, struct blob_attr *vlan)
{
- struct vlan_device *vldev = container_of(dev, struct vlan_device, dev);
-
- dev = vldev->dep.dev;
- if (!dev || !dev->hotplug_ops)
- return UBUS_STATUS_NOT_SUPPORTED;
+ return __vlan_hotplug_op(dev, member, vlan, true);
+}
- return dev->hotplug_ops->del(dev, member);
+static int
+vlan_hotplug_del(struct device *dev, struct device *member, struct blob_attr *vlan)
+{
+ return __vlan_hotplug_op(dev, member, vlan, false);
}
static int
};
static int
-vlandev_hotplug_add(struct device *dev, struct device *member, struct blob_attr *vlan)
+__vlandev_hotplug_op(struct device *dev, struct device *member, struct blob_attr *vlan, bool add)
{
struct vlandev_device *mvdev = container_of(dev, struct vlandev_device, dev);
void *a;
blobmsg_printf(&b, NULL, "%d", mvdev->config.vid);
blobmsg_close_array(&b, a);
- return dev->hotplug_ops->add(dev, member, blobmsg_data(b.head));
+ if (add)
+ return dev->hotplug_ops->add(dev, member, blobmsg_data(b.head));
+ else
+ return dev->hotplug_ops->del(dev, member, blobmsg_data(b.head));
}
static int
-vlandev_hotplug_del(struct device *dev, struct device *member)
+vlandev_hotplug_add(struct device *dev, struct device *member, struct blob_attr *vlan)
{
- struct vlandev_device *mvdev = container_of(dev, struct vlandev_device, dev);
-
- dev = mvdev->parent.dev;
- if (!dev || !dev->hotplug_ops)
- return UBUS_STATUS_NOT_SUPPORTED;
+ return __vlandev_hotplug_op(dev, member, vlan, true);
+}
- return dev->hotplug_ops->del(dev, member);
+static int
+vlandev_hotplug_del(struct device *dev, struct device *member, struct blob_attr *vlan)
+{
+ return __vlandev_hotplug_op(dev, member, vlan, false);
}
static int