diff mbox series

[net,1/4] net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled

Message ID 20200414041630.5740-2-f.fainelli@gmail.com
State Superseded
Delegated to: David Miller
Headers show
Series net: dsa: b53: Various ARL fixes | expand

Commit Message

Florian Fainelli April 14, 2020, 4:16 a.m. UTC 
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")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/dsa/b53/b53_common.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Andrew Lunn April 14, 2020, 2:03 p.m. UTC | #1 
On Mon, Apr 13, 2020 at 09:16:27PM -0700, Florian Fainelli wrote:
> 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")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew
diff mbox series

Patch

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;
 	}