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 2019-12-23 11:42:02.728620670 +0800
3 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c 2019-12-23 11:42:48.747289058 +0800
5 if (!(trxd.rxd2 & RX_DMA_DONE))
8 - /* find out which mac the packet come from. values start at 1 */
9 -#if defined(CONFIG_NET_DSA)
10 - mac = (trxd.rxd4 >> 22) & 0x1;
11 - mac = (mac + 1) % 2;
13 mac = (trxd.rxd4 >> RX_DMA_FPORT_SHIFT) &
15 /* From QDMA(5). This is a external interface case of HWNAT.
22 if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT ||
25 @@ -2030,10 +2025,6 @@
26 /* Disable RX VLan Offloading */
27 mtk_w32(eth, 0, MTK_CDMP_EG_CTRL);
29 -#if defined(CONFIG_NET_DSA)
30 - mtk_w32(eth, 0x81000001, MTK_CDMP_IG_CTRL);
33 mtk_w32(eth, 0x8f0f8f0f, MTK_PDMA_DELAY_INT);
34 mtk_w32(eth, 0x8f0f8f0f, MTK_QDMA_DELAY_INT);