From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 21 Apr 2020 03:26:51 +0000 (-0700)
Subject: net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled
X-Git-Tag: v4.19.119~66
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=a224e376938fce615ba702668d946f0276b517c7;p=wrapfs-5.3.y.git

net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled

[ Upstream commit 2e97b0cd1651a270f3a3fcf42115c51f3284c049 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index ac5d945b934a..756d2934218d 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1284,6 +1284,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;
 	}