1 diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
2 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2020-03-31 16:05:24.398403054 +0800
3 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2020-03-31 16:05:39.142008780 +0800
5 skb->protocol = eth_type_trans(skb, netdev);
7 if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX &&
8 - RX_DMA_VID(trxd.rxd3))
9 + (trxd.rxd2 & RX_DMA_VTAG))
10 __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
11 RX_DMA_VID(trxd.rxd3));
12 skb_record_rx_queue(skb, 0);
13 diff -urN a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
14 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h 2020-03-31 16:05:29.726260583 +0800
15 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h 2020-03-31 16:05:43.493892389 +0800
17 #define RX_DMA_LSO BIT(30)
18 #define RX_DMA_PLEN0(_x) (((_x) & 0x3fff) << 16)
19 #define RX_DMA_GET_PLEN0(_x) (((_x) >> 16) & 0x3fff)
20 +#define RX_DMA_VTAG BIT(15)
22 /* QDMA descriptor rxd3 */
23 #define RX_DMA_VID(_x) ((_x) & 0xfff)