};
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;
blob_buf_init(&b, 0);
a = blobmsg_open_array(&b, "vlans");
- blobmsg_printf(&b, NULL, "%d", mvdev->config.vid);
+ blobmsg_printf(&b, NULL, "%d:u", mvdev->config.vid);
+ if (vlan && blobmsg_len(vlan))
+ blob_put_raw(&b, blobmsg_data(vlan), blobmsg_len(vlan));
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
struct device *dev = mvdev->parent.dev;
if (!dev || !dev->hotplug_ops || avl_is_empty(&dev->vlans.avl) ||
- dev->type != &vlan8021q_device_type) {
+ mvdev->dev.type != &vlan8021q_device_type) {
mvdev->dev.hotplug_ops = NULL;
return;
}
case DEV_EVENT_UPDATE_IFNAME:
vlandev_hotplug_check(mvdev);
break;
+ case DEV_EVENT_TOPO_CHANGE:
+ /* Propagate topo changes */
+ device_broadcast_event(&mvdev->dev, DEV_EVENT_TOPO_CHANGE);
+ break;
default:
return;
}
{
struct blob_attr *cur;
struct vlan_qos_mapping *qos_mapping;
- int rem, rc;
+ size_t rem;
+ int rc;
blobmsg_for_each_attr(cur, list, rem) {
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)