[PATCH] net-next: mediatek: fix compile error inside mtk_poll_controller()

Subsystems: mediatek ethernet driver, networking drivers, the rest

STALE3691d

2 messages, 2 authors, 2016-07-02 · open the first message on its own page

[PATCH] net-next: mediatek: fix compile error inside mtk_poll_controller()

From: John Crispin <john@phrozen.org>
Date: 2016-07-02 06:01:25

commit 8067302973a1 ("net-next: mediatek: add support for IRQ grouping")
failed to properly update the irq handling inside mtk_poll_controller()
causing compile errors if netconsole was enabled. Fix this by updating
the code to use the new separated irq handler function for RX.

Signed-off-by: John Crispin <redacted>

---

Hi Dave,

ideally you could fold this into the following patch inside net-next.git

commit 8067302973a1 ("net-next: mediatek: add support for IRQ grouping")

	John
---
 drivers/net/ethernet/mediatek/mtk_eth_soc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 7056a37..fbab9b2 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1297,7 +1297,7 @@ static void mtk_poll_controller(struct net_device *dev)
 	u32 int_mask = MTK_TX_DONE_INT | MTK_RX_DONE_INT;
 
 	mtk_irq_disable(eth, int_mask);
-	mtk_handle_irq(dev->irq[0], dev);
+	mtk_handle_irq_rx(eth->irq[2], dev);
 	mtk_irq_enable(eth, int_mask);
 }
 #endif
-- 
1.7.10.4

Re: [PATCH] net-next: mediatek: fix compile error inside mtk_poll_controller()

From: David Miller <davem@davemloft.net>
Date: 2016-07-02 20:39:09

From: John Crispin <john@phrozen.org>
Date: Sat,  2 Jul 2016 08:00:50 +0200
commit 8067302973a1 ("net-next: mediatek: add support for IRQ grouping")
failed to properly update the irq handling inside mtk_poll_controller()
causing compile errors if netconsole was enabled. Fix this by updating
the code to use the new separated irq handler function for RX.

Signed-off-by: John Crispin <john@phrozen.org>
Applied.
ideally you could fold this into the following patch inside net-next.git
There is no "folding" in my tree, commits are forever and history is
never changed or modified ever.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help