bridge: fix config reload on 32 bit systems

[project/netifd.git] / vlan.c

diff --git a/vlan.c b/vlan.c
index 3d444a94c19e913880d0250aa6f34991beb59849..4e843442af07b5063d7d9146ffb6bab316becd65 100644 (file)
--- a/vlan.c
+++ b/vlan.c
@@ -51,7 +51,9 @@ __vlan_hotplug_op(struct device *dev, struct device *member, struct blob_attr *v
 
        blob_buf_init(&b, 0);
        a = blobmsg_open_array(&b, "vlans");
-       blobmsg_printf(&b, NULL, "%d", vldev->id);
+       blobmsg_printf(&b, NULL, "%d:u", vldev->id);
+       if (vlan && blobmsg_len(vlan))
+               blob_put_raw(&b, blobmsg_data(vlan), blobmsg_len(vlan));
        blobmsg_close_array(&b, a);
 
        if (add)
@@ -143,7 +145,7 @@ static void vlan_dev_cb(struct device_user *dep, enum device_event ev)
                vlan_hotplug_check(vldev, dep->dev);
                vldev->dev.hidden = dep->dev->hidden;
                if (snprintf(name, sizeof(name), "%s.%d", dep->dev->ifname,
-                            vldev->id) >= sizeof(name) - 1 ||
+                            vldev->id) >= (int)sizeof(name) - 1 ||
                    device_set_ifname(&vldev->dev, name))
                        free_vlan_if(&vldev->dev);
                break;
@@ -203,7 +205,7 @@ static struct device *get_vlan_device(struct device *dev, char *id_str, bool cre
        if (!create)
                return NULL;
 
-       if (snprintf(name, sizeof(name), "%s.%d", dev->ifname, id) >= sizeof(name) - 1)
+       if (snprintf(name, sizeof(name), "%s.%d", dev->ifname, id) >= (int)sizeof(name) - 1)
                return NULL;
 
        D(DEVICE, "Create vlan device '%s'\n", name);