summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/mediatek
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2022-11-14 13:42:12 +0100
committerJakub Kicinski <kuba@kernel.org>2022-11-15 20:22:07 -0800
commit190487031584a1d24c92e0d82717a30169ac8929 (patch)
treeb6e7c6257692bff9b9f955bcfe81b9c722b804b8 /drivers/net/ethernet/mediatek
parent570d0a588dfbb11f9ef80ed933d0403a0e995688 (diff)
downloadlinux-stable-190487031584a1d24c92e0d82717a30169ac8929.tar.gz
linux-stable-190487031584a1d24c92e0d82717a30169ac8929.tar.bz2
linux-stable-190487031584a1d24c92e0d82717a30169ac8929.zip
net: ethernet: mtk_eth_soc: pass correct VLAN protocol ID to the network stack
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>
Diffstat (limited to 'drivers/net/ethernet/mediatek')
-rw-r--r--drivers/net/ethernet/mediatek/mtk_eth_soc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 1cf76fd7afbc..891dd6937f89 100644
--- 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));
}