net: ethernet: mtk_eth_soc: pass correct VLAN protocol ID to the network stack

nbd168 · kuba-moo · commit 190487031584 · 2022-11-15T20:22:07.000-08:00
Use the id from the DMA descriptor instead of hardcoding 802.1q

Signed-off-by: Felix Fietkau &lt;nbd@nbd.name&gt;
Signed-off-by: Jakub Kicinski &lt;kuba@kernel.org&gt;
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1936,7 +1936,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
 						htons(RX_DMA_VPID(trxd.rxd4)),
 						RX_DMA_VID(trxd.rxd4));
 			} else if (trxd.rxd2 & RX_DMA_VTAG) {
-				__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+				__vlan_hwaccel_put_tag(skb, htons(RX_DMA_VPID(trxd.rxd3)),
 						       RX_DMA_VID(trxd.rxd3));
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -1936,7 +1936,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,`
`1936`	`1936`	`htons(RX_DMA_VPID(trxd.rxd4)),`
`1937`	`1937`	`RX_DMA_VID(trxd.rxd4));`
`1938`	`1938`	`} else if (trxd.rxd2 & RX_DMA_VTAG) {`
`1939`		`- __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),`
	`1939`	`+ __vlan_hwaccel_put_tag(skb, htons(RX_DMA_VPID(trxd.rxd3)),`
`1940`	`1940`	`RX_DMA_VID(trxd.rxd3));`
`1941`	`1941`	`}`
`1942`	`1942`