diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2020-04-20 20:26:51 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-22 12:50:41 -0700 |
| commit | 2e97b0cd1651a270f3a3fcf42115c51f3284c049 (patch) | |
| tree | b506bbf8b1ed07d82549484da0941689447f15fb /drivers/net/dsa/b53/b53_common.c | |
| parent | Merge branch 'vrf-looping' (diff) | |
| download | linux-dev-2e97b0cd1651a270f3a3fcf42115c51f3284c049.tar.xz linux-dev-2e97b0cd1651a270f3a3fcf42115c51f3284c049.zip | |
net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled
When VLAN is enabled, and an ARL search is issued, we also need to
compare the full {MAC,VID} tuple before returning a successful search
result.
Fixes: 1da6df85c6fb ("net: dsa: b53: Implement ARL add/del/dump operations")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 68e2381694b9..fa9b9aca7b56 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1505,6 +1505,9 @@ static int b53_arl_read(struct b53_device *dev, u64 mac, continue; if ((mac_vid & ARLTBL_MAC_MASK) != mac) continue; + if (dev->vlan_enabled && + ((mac_vid >> ARLTBL_VID_S) & ARLTBL_VID_MASK) != vid) + continue; *idx = i; } |