bridge: make hotplug-added vlans default to tagged

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index cc15537ba3ad6cd4b9e96f5a389c36dfef1a4018..0760e73f1cf3d9b9a3975b7c28f91e22ae52ac12 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -985,7 +985,7 @@ int system_bridge_delif(struct device *bridge, struct device *dev)
        return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF, NULL);
 }
 
-int system_bridge_vlan(const char *iface, uint16_t vid, bool add, unsigned int vflags)
+int system_bridge_vlan(const char *iface, uint16_t vid, int16_t vid_end, bool add, unsigned int vflags)
 {
        struct bridge_vlan_info vinfo = { .vid = vid, };
        unsigned short flags = 0;
@@ -1020,7 +1020,18 @@ int system_bridge_vlan(const char *iface, uint16_t vid, bool add, unsigned int v
        if (flags)
                nla_put_u16(nlm, IFLA_BRIDGE_FLAGS, flags);
 
+       if (vid_end > vid)
+               vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_BEGIN;
+
        nla_put(nlm, IFLA_BRIDGE_VLAN_INFO, sizeof(vinfo), &vinfo);
+
+       if (vid_end > vid) {
+               vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
+               vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_END;
+               vinfo.vid = vid_end;
+               nla_put(nlm, IFLA_BRIDGE_VLAN_INFO, sizeof(vinfo), &vinfo);
+       }
+
        nla_nest_end(nlm, afspec);
 
        return system_rtnl_call(nlm);