Vladimir Oltean 09fdb6747b net: dsa: tag_8021q: fix the VLAN IDs used for encoding sub-VLANs ... [ Upstream commit 4ef8d857b5f494e62bce9085031563fda35f9563 ] When using sub-VLANs in the range of 1-7, the resulting value from: rx_vid = dsa_8021q_rx_vid_subvlan(ds, port, subvlan); is wrong according to the description from tag_8021q.c: | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | +-----------+-----+-----------------+-----------+-----------------------+ | DIR | SVL | SWITCH_ID | SUBVLAN | PORT | +-----------+-----+-----------------+-----------+-----------------------+ For example, when ds->index == 0, port == 3 and subvlan == 1, dsa_8021q_rx_vid_subvlan() returns 1027, same as it returns for subvlan == 0, but it should have returned 1043. This is because the low portion of the subvlan bits are not masked properly when writing into the 12-bit VLAN value. They are masked into bits 4:3, but they should be masked into bits 5:4. Fixes: 3eaae1d05f ("net: dsa: tag_8021q: support up to 8 VLANs per port using sub-VLANs") Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>		2021-06-10 13:39:17 +02:00
..
dsa_priv.h
dsa.c
dsa2.c
Kconfig
Makefile
master.c
port.c
slave.c
switch.c
tag_8021q.c	net: dsa: tag_8021q: fix the VLAN IDs used for encoding sub-VLANs	2021-06-10 13:39:17 +02:00
tag_ar9331.c
tag_brcm.c
tag_dsa.c
tag_edsa.c
tag_gswip.c
tag_ksz.c
tag_lan9303.c
tag_mtk.c
tag_ocelot.c
tag_qca.c
tag_rtl4_a.c
tag_sja1105.c
tag_trailer.c