aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEric Woudstra <ericwouds@gmail.com>2021-07-19 20:23:57 +0200
committerDavid S. Miller <davem@davemloft.net>2021-07-20 07:01:14 -0700
commit7e777021780e9c373fc0c04d40b8407ce8c3b5d5 (patch)
tree8bdf85ebc66f6fba92f001b936b0e495a2934acb /drivers/net
parentMerge branch 'octeon-DMAC' (diff)
downloadlinux-dev-7e777021780e9c373fc0c04d40b8407ce8c3b5d5.tar.xz
linux-dev-7e777021780e9c373fc0c04d40b8407ce8c3b5d5.zip
mt7530 mt7530_fdb_write only set ivl bit vid larger than 1
Fixes my earlier patch which broke vlan unaware bridges. The IVL bit now only gets set for vid's larger than 1. Fixes: 11d8d98cbeef ("mt7530 fix mt7530_fdb_write vid missing ivl bit") Signed-off-by: Eric Woudstra <ericwouds@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/dsa/mt7530.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 9e4df35f92cc..69f21b71614c 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -366,7 +366,8 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid,
int i;
reg[1] |= vid & CVID_MASK;
- reg[1] |= ATA2_IVL;
+ if (vid > 1)
+ reg[1] |= ATA2_IVL;
reg[2] |= (aging & AGE_TIMER_MASK) << AGE_TIMER;
reg[2] |= (port_mask & PORT_MAP_MASK) << PORT_MAP;
/* STATIC_ENT indicate that entry is static wouldn't