Skip to content

Commit 0b2b270

Browse files
KanjiMonsterkuba-moo
authored andcommitted
net: dsa: b53: allow VID 0 for BCM5325/65
Now that writing ARL entries works properly, we can actually use VID 0 as the default untagged VLAN for BCM5325 and BCM5365 as well. So use 0 as default PVID for all chips and do not reject VLAN 0 anymore, which we ignored since commit 45e9d59 ("net: dsa: b53: do not allow to configure VLAN 0") anyway. Signed-off-by: Jonas Gorski <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent d39514e commit 0b2b270

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/net/dsa/b53/b53_common.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -872,10 +872,7 @@ static void b53_enable_stp(struct b53_device *dev)
872872

873873
static u16 b53_default_pvid(struct b53_device *dev)
874874
{
875-
if (is5325(dev) || is5365(dev))
876-
return 1;
877-
else
878-
return 0;
875+
return 0;
879876
}
880877

881878
static bool b53_vlan_port_needs_forced_tagged(struct dsa_switch *ds, int port)
@@ -1699,9 +1696,6 @@ static int b53_vlan_prepare(struct dsa_switch *ds, int port,
16991696
{
17001697
struct b53_device *dev = ds->priv;
17011698

1702-
if ((is5325(dev) || is5365(dev)) && vlan->vid == 0)
1703-
return -EOPNOTSUPP;
1704-
17051699
/* Port 7 on 7278 connects to the ASP's UniMAC which is not capable of
17061700
* receiving VLAN tagged frames at all, we can still allow the port to
17071701
* be configured for egress untagged.

0 commit comments

Comments
 (0)