bridge: make hotplug-added vlans default to tagged

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index c8cfca418f83484849b670730e4e971138eb5503..fb1f196ad3c892ddb7d22b80396017b417ca2895 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -206,7 +206,7 @@ __bridge_set_member_vlan(struct bridge_member *bm, struct bridge_vlan *vlan,
        if (bm->pvid == vlan->vid)
                flags |= BRVLAN_F_PVID;
 
-       system_bridge_vlan(port->ifname, vlan->vid, add, flags);
+       system_bridge_vlan(port->ifname, vlan->vid, -1, add, flags);
 }
 
 static void
@@ -233,7 +233,7 @@ bridge_set_local_vlan(struct bridge_state *bst, struct bridge_vlan *vlan, bool a
        if (!vlan->local && add)
                return;
 
-       system_bridge_vlan(bst->dev.ifname, vlan->vid, add, BRVLAN_F_SELF);
+       system_bridge_vlan(bst->dev.ifname, vlan->vid, -1, add, BRVLAN_F_SELF);
 }
 
 static void
@@ -361,7 +361,7 @@ bridge_enable_interface(struct bridge_state *bst)
 
        if (bst->has_vlans) {
                /* delete default VLAN 1 */
-               system_bridge_vlan(bst->dev.ifname, 1, false, BRVLAN_F_SELF);
+               system_bridge_vlan(bst->dev.ifname, 1, -1, false, BRVLAN_F_SELF);
 
                bridge_set_local_vlans(bst, true);
        }
@@ -394,6 +394,17 @@ bridge_disable_interface(struct bridge_state *bst)
        bst->active = false;
 }
 
+static void
+bridge_member_add_extra_vlans(struct bridge_member *bm)
+{
+       struct device *dev = bm->dev.dev;
+       int i;
+
+       for (i = 0; i < dev->n_extra_vlan; i++)
+               system_bridge_vlan(dev->ifname, dev->extra_vlan[i].start,
+                                  dev->extra_vlan[i].end, true, 0);
+}
+
 static int
 bridge_enable_member(struct bridge_member *bm)
 {
@@ -435,8 +446,9 @@ bridge_enable_member(struct bridge_member *bm)
        bm->active = true;
        if (bst->has_vlans) {
                /* delete default VLAN 1 */
-               system_bridge_vlan(bm->dev.dev->ifname, 1, false, 0);
+               system_bridge_vlan(bm->dev.dev->ifname, 1, -1, false, 0);
 
+               bridge_member_add_extra_vlans(bm);
                vlist_for_each_element(&bst->dev.vlans, vlan, node)
                        bridge_set_member_vlan(bm, vlan, true);
        }
@@ -789,7 +801,7 @@ bridge_hotplug_set_member_vlans(struct bridge_state *bst, struct blob_attr *vlan
 
        blobmsg_for_each_attr(cur, vlans, rem) {
                struct bridge_vlan_hotplug_port *port;
-               uint16_t flags = BRVLAN_F_UNTAGGED;
+               uint16_t flags = 0;
                char *name_buf;
                unsigned int vid;
                char *end;
@@ -816,8 +828,8 @@ bridge_hotplug_set_member_vlans(struct bridge_state *bst, struct blob_attr *vlan
 
                        for (end++; *end; end++) {
                                switch (*end) {
-                               case 't':
-                                       flags &= ~BRVLAN_F_UNTAGGED;
+                               case 'u':
+                                       flags |= BRVLAN_F_UNTAGGED;
                                        break;
                                case '*':
                                        flags |= BRVLAN_F_PVID;