net: ethernet: mtk_eth_soc: pass correct VLAN protocol ID to the network stack
authorFelix Fietkau <nbd@nbd.name>
Mon, 14 Nov 2022 12:42:12 +0000 (13:42 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 16 Nov 2022 04:22:07 +0000 (20:22 -0800)
Use the id from the DMA descriptor instead of hardcoding 802.1q

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index 1cf76fd7afbc619991f4cc75444c4b86804d92dd..891dd6937f897ded2795e6138744f943dbd654f6 100644 (file)
@@ -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));
                        }