From: John Crispin <john@phrozen.org>
Date: Sat, 2 Jul 2016 06:00:50 +0000 (+0200)
Subject: net-next: mediatek: fix compile error inside mtk_poll_controller()
X-Git-Tag: v4.8-rc1~140^2~203
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8186f6e382d8719d0a4bc0ef218c4dd7cf55b496;p=users%2Fhch%2Fmisc.git
net-next: mediatek: fix compile error inside mtk_poll_controller()
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 7056a375b329..fbab9b27519b 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