Skip to content

Commit 0ce4f95

Browse files
IoanaCiorneigregkh
authored andcommitted
dpaa2-switch: fix VLAN upper check not rejecting bridge join
[ Upstream commit ed2294f ] The blamed commit refactored the prechangeupper event handling but failed to actually return an error in case dpaa2_switch_prevent_bridging_with_8021q_upper() detected a 802.1q upper on a port which tries to join a bridge. Fix this by returning err instead of 0. Fixes: 45035fe ("net: dpaa2-switch: refactor prechangeupper sanity checks") Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Link: https://patch.msgid.link/20260616105430.3725910-1-ioana.ciornei@nxp.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 38e94d6 commit 0ce4f95

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,7 @@ dpaa2_switch_prechangeupper_sanity_checks(struct net_device *netdev,
21802180
if (err) {
21812181
NL_SET_ERR_MSG_MOD(extack,
21822182
"Cannot join a bridge while VLAN uppers are present");
2183-
return 0;
2183+
return err;
21842184
}
21852185

21862186
return 0;

0 commit comments

Comments
 (0)