[PATCH 22/26] atl1: update netpoll

[jacliburn]

From: Jay Cliburn <jacliburn@xxxxxxxxxxxxx>

Rename atl1_poll_controller() to atl1_netpoll() and update to conform with
the current vendor driver version 1.2.40.2.

Signed-off-by: Jay Cliburn <jacliburn@xxxxxxxxxxxxx>
---
 drivers/net/atlx/atl1.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 997c83c..f09928d 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2691,11 +2691,14 @@ static int atl1_resume(struct pci_dev *pdev)
 #endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-static void atl1_poll_controller(struct net_device *netdev)
+static void atl1_netpoll(struct net_device *netdev)
 {
-	disable_irq(netdev->irq);
+	struct atl1_adapter *adapter = netdev_priv(netdev);
+
+	disable_irq(adapter->pdev->irq);
 	atl1_intr(netdev->irq, netdev);
-	enable_irq(netdev->irq);
+	atl1_clean_tx_irq(adapter);
+	enable_irq(adapter->pdev->irq);
 }
 #endif
 
@@ -2796,7 +2799,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
 	netdev->tx_timeout = &atlx_tx_timeout;
 	netdev->watchdog_timeo = 5 * HZ;
 #ifdef CONFIG_NET_POLL_CONTROLLER
-	netdev->poll_controller = atl1_poll_controller;
+	netdev->poll_controller = atl1_netpoll;
 #endif
 	netdev->vlan_rx_register = atlx_vlan_rx_register;
 
-- 
1.5.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/