diff options
| author |   Francois Romieu <romieu@fr.zoreil.com> | 2012-03-08 10:06:18 +0100 |
|---|---|---|
| committer | Francois Romieu <romieu@fr.zoreil.com> | 2012-03-10 22:39:22 +0100 |
| commit | dc1c00ce70da5d3bb3fc97707e04f598ff72e7ba (patch) | |
| tree | 346d4011e8174f1d4ad99687d73bcdd919951100 /drivers/net/ethernet/realtek/r8169.c | |
| parent | r8169: move rtl8169_open after rtl_task it depends on. (diff) | |
| download | linux-dev-dc1c00ce70da5d3bb3fc97707e04f598ff72e7ba.tar.xz linux-dev-dc1c00ce70da5d3bb3fc97707e04f598ff72e7ba.zip | |
r8169: move the netpoll handler after the irq handler.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes Wang <hayeswang@realtek.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 8d4515ed7946..12329c5e1ede 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -774,8 +774,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); @@ -3289,15 +3287,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) { @@ -5720,6 +5709,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); |