]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: dsa: mv88e6xxx: exclude all ports in new VLAN
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Wed, 7 Jun 2017 22:12:16 +0000 (18:12 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 15:43:32 +0000 (11:43 -0400)
Now that the DSA core adds the CPU and DSA ports itself to the new VLAN
entry, there is no need to include them as members of this VLAN when
initializing a new VTU entry.

As of now, initialize a new VTU entry with all ports excluded.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx/chip.c

index 962b4e873bf93e0a93ab515fbbc92bf47ad00672..41202b1d6d7f83ed71deead9057c4dd9d2681e57 100644 (file)
@@ -1159,11 +1159,10 @@ static int mv88e6xxx_vtu_get(struct mv88e6xxx_chip *chip, u16 vid,
                entry->valid = true;
                entry->vid = vid;
 
-               /* Include only CPU and DSA ports */
+               /* Exclude all ports */
                for (i = 0; i < mv88e6xxx_num_ports(chip); ++i)
-                       entry->member[i] = dsa_is_normal_port(chip->ds, i) ?
-                               GLOBAL_VTU_DATA_MEMBER_TAG_NON_MEMBER :
-                               GLOBAL_VTU_DATA_MEMBER_TAG_UNMODIFIED;
+                       entry->member[i] =
+                               GLOBAL_VTU_DATA_MEMBER_TAG_NON_MEMBER;
 
                return mv88e6xxx_atu_new(chip, &entry->fid);
        }