Skip to content

Commit 5f93185

Browse files
KanjiMonsterkuba-moo
authored andcommitted
net: dsa: b53: allow leaky reserved multicast
Allow reserved multicast to ignore VLAN membership so STP and other management protocols work without a PVID VLAN configured when using a vlan aware bridge. Fixes: 967dd82 ("net: dsa: b53: Add support for Broadcom RoboSwitch") Signed-off-by: Jonas Gorski <[email protected]> Tested-by: Florian Fainelli <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ea78f20 commit 5f93185

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/net/dsa/b53/b53_common.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,11 @@ static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,
373373
b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5, &vc5);
374374
}
375375

376+
vc1 &= ~VC1_RX_MCST_FWD_EN;
377+
376378
if (enable) {
377379
vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID;
378-
vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN;
380+
vc1 |= VC1_RX_MCST_UNTAG_EN;
379381
vc4 &= ~VC4_ING_VID_CHECK_MASK;
380382
if (enable_filtering) {
381383
vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;
@@ -393,7 +395,7 @@ static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,
393395

394396
} else {
395397
vc0 &= ~(VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID);
396-
vc1 &= ~(VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN);
398+
vc1 &= ~VC1_RX_MCST_UNTAG_EN;
397399
vc4 &= ~VC4_ING_VID_CHECK_MASK;
398400
vc5 &= ~VC5_DROP_VTABLE_MISS;
399401

0 commit comments

Comments
 (0)