mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-06 12:44:00 -05:00
4814636b9b
Replace pending b53 fixes patches with the accepted ones from net-next for linux v6.19. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 9316012dd01952f75e37035360138ccc786ef727 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Date: Fri, 28 Nov 2025 09:06:20 +0100
|
|
Subject: [PATCH] net: dsa: b53: fix extracting VID from entry for BCM5325/65
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
BCM5325/65's Entry register uses the highest three bits for
|
|
VALID/STATIC/AGE, so shifting by 53 only will add these to
|
|
b53_arl_entry::vid.
|
|
|
|
So make sure to mask the vid value as well, to not get invalid VIDs.
|
|
|
|
Fixes: c45655386e53 ("net: dsa: b53: add support for FDB operations on 5325/5365")
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Tested-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
Link: https://patch.msgid.link/20251128080625.27181-3-jonas.gorski@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/b53/b53_priv.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/b53/b53_priv.h
|
|
+++ b/drivers/net/dsa/b53/b53_priv.h
|
|
@@ -350,7 +350,7 @@ static inline void b53_arl_to_entry_25(s
|
|
ent->is_age = !!(mac_vid & ARLTBL_AGE_25);
|
|
ent->is_static = !!(mac_vid & ARLTBL_STATIC_25);
|
|
u64_to_ether_addr(mac_vid, ent->mac);
|
|
- ent->vid = mac_vid >> ARLTBL_VID_S_65;
|
|
+ ent->vid = (mac_vid >> ARLTBL_VID_S_65) & ARLTBL_VID_MASK_25;
|
|
}
|
|
|
|
static inline void b53_arl_to_entry_89(struct b53_arl_entry *ent,
|