r8169: move the netpoll handler after the irq handler.

(cherry picked from commit dc1c00ce70da5d3bb3fc97707e04f598ff72e7ba)
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bb53660ceac6ca6e9760d9a738f2af8ea1ea7bc9..ff81ec33d249ba82706949510baf0c58f6e73937 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -777,8 +777,6 @@ MODULE_FIRMWARE(FIRMWARE_8105E_1);
 MODULE_FIRMWARE(FIRMWARE_8168F_1);
 MODULE_FIRMWARE(FIRMWARE_8168F_2);
 
-static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance);
-
 static void rtl_lock_work(struct rtl8169_private *tp)
 {
        mutex_lock(&tp->wk.mutex);
@@ -3280,15 +3278,6 @@ static void rtl8169_phy_timer(unsigned long __opaque)
        rtl_schedule_task(tp, RTL_FLAG_TASK_PHY_PENDING);
 }
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void rtl8169_netpoll(struct net_device *dev)
-{
-       struct rtl8169_private *tp = netdev_priv(dev);
-
-       rtl8169_interrupt(tp->pci_dev->irq, dev);
-}
-#endif
-
 static void rtl8169_release_board(struct pci_dev *pdev, struct net_device *dev,
                                  void __iomem *ioaddr)
 {
@@ -5681,6 +5670,15 @@ static int rtl8169_close(struct net_device *dev)
        return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void rtl8169_netpoll(struct net_device *dev)
+{
+       struct rtl8169_private *tp = netdev_priv(dev);
+
+       rtl8169_interrupt(tp->pci_dev->irq, dev);
+}
+#endif
+
 static int rtl_open(struct net_device *dev)
 {
        struct rtl8169_private *tp = netdev_priv(dev);