| From 7b122a25756983f4db0eaf2c465a9a028018492f Mon Sep 17 00:00:00 2001 |
| From: Ido Schimmel <idosch@mellanox.com> |
| Date: Tue, 11 Jun 2019 10:19:46 +0300 |
| Subject: mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed |
| |
| [ Upstream commit 4b14cc313f076c37b646cee06a85f0db59cf216c ] |
| |
| When PVID is removed from a bridge port, the Linux bridge drops both |
| untagged and prio-tagged packets. Align mlxsw with this behavior. |
| |
| Fixes: 148f472da5db ("mlxsw: reg: Add the Switch Port Acceptable Frame Types register") |
| Acked-by: Jiri Pirko <jiri@mellanox.com> |
| Signed-off-by: Ido Schimmel <idosch@mellanox.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h |
| index 5acfbe5b8b9d..8ab7a4f98a07 100644 |
| --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h |
| +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h |
| @@ -911,7 +911,7 @@ static inline void mlxsw_reg_spaft_pack(char *payload, u8 local_port, |
| MLXSW_REG_ZERO(spaft, payload); |
| mlxsw_reg_spaft_local_port_set(payload, local_port); |
| mlxsw_reg_spaft_allow_untagged_set(payload, allow_untagged); |
| - mlxsw_reg_spaft_allow_prio_tagged_set(payload, true); |
| + mlxsw_reg_spaft_allow_prio_tagged_set(payload, allow_untagged); |
| mlxsw_reg_spaft_allow_tagged_set(payload, true); |
| } |
| |
| -- |
| 2.20.1 |
| |
