1 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
2 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
3 @@ -999,11 +999,6 @@ static int mtk_poll_rx(struct napi_struc
4 if (!(trxd.rxd2 & RX_DMA_DONE))
7 - /* find out which mac the packet come from. values start at 1 */
8 -#if defined(CONFIG_NET_DSA)
9 - mac = (trxd.rxd4 >> 22) & 0x1;
10 - mac = (mac + 1) % 2;
12 mac = (trxd.rxd4 >> RX_DMA_FPORT_SHIFT) &
14 /* From QDMA(5). This is a external interface case of HWNAT.
15 @@ -1017,7 +1012,7 @@ static int mtk_poll_rx(struct napi_struc
21 if (unlikely(mac < 0 || mac >= MTK_MAC_COUNT ||
24 @@ -2030,10 +2025,6 @@ static int mtk_hw_init(struct mtk_eth *e
25 /* Disable RX VLan Offloading */
26 mtk_w32(eth, 0, MTK_CDMP_EG_CTRL);
28 -#if defined(CONFIG_NET_DSA)
29 - mtk_w32(eth, 0x81000001, MTK_CDMP_IG_CTRL);
32 mtk_w32(eth, 0x8f0f8f0f, MTK_PDMA_DELAY_INT);
33 mtk_w32(eth, 0x8f0f8f0f, MTK_QDMA_DELAY_INT);