Vladimir Oltean 4ef8d857b5 net: dsa: tag_8021q: fix the VLAN IDs used for encoding sub-VLANs
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: 3eaae1d05f2b ("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>
2021-06-01 15:02:05 -07:00
..
2021-03-30 16:54:50 -07:00
2021-04-29 11:57:23 -07:00
2021-03-26 20:41:52 -07:00
2021-04-09 16:34:56 -07:00
2021-05-24 14:10:28 -07:00
2021-03-28 17:31:13 -07:00
2021-04-29 11:57:23 -07:00
2021-05-21 14:46:59 -07:00
2021-04-29 11:57:23 -07:00
2021-05-07 11:23:41 -07:00
2021-01-24 14:27:18 +01:00
2021-03-28 17:31:13 -07:00
2021-03-25 16:56:27 -07:00