1673b7dca3
Backport patches from net-next which fix possible memory and resource leaks in the error codepaths of WED initialization. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From c9da02bfb1112461e048d3b736afb1873f6f4ccf Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Tue, 27 Sep 2022 16:30:02 +0100
|
|
Subject: [PATCH 1/1] net: ethernet: mtk_eth_soc: fix mask of
|
|
RX_DMA_GET_SPORT{,_V2}
|
|
|
|
The bitmasks applied in RX_DMA_GET_SPORT and RX_DMA_GET_SPORT_V2 macros
|
|
were swapped. Fix that.
|
|
|
|
Reported-by: Chen Minqiang <ptpt52@gmail.com>
|
|
Fixes: 160d3a9b192985 ("net: ethernet: mtk_eth_soc: introduce MTK_NETSYS_V2 support")
|
|
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Link: https://lore.kernel.org/r/YzMW+mg9UsaCdKRQ@makrotopia.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -315,8 +315,8 @@
|
|
#define MTK_RXD5_PPE_CPU_REASON GENMASK(22, 18)
|
|
#define MTK_RXD5_SRC_PORT GENMASK(29, 26)
|
|
|
|
-#define RX_DMA_GET_SPORT(x) (((x) >> 19) & 0xf)
|
|
-#define RX_DMA_GET_SPORT_V2(x) (((x) >> 26) & 0x7)
|
|
+#define RX_DMA_GET_SPORT(x) (((x) >> 19) & 0x7)
|
|
+#define RX_DMA_GET_SPORT_V2(x) (((x) >> 26) & 0xf)
|
|
|
|
/* PDMA V2 descriptor rxd3 */
|
|
#define RX_DMA_VTAG_V2 BIT(0)
|