diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/qlge/qlge_main.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 225930fda5af..02147082786d 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -1647,7 +1647,7 @@ static int ql_napi_poll_msix(struct napi_struct *napi, int budget) | |||
1647 | rx_ring->cq_id); | 1647 | rx_ring->cq_id); |
1648 | 1648 | ||
1649 | if (work_done < budget) { | 1649 | if (work_done < budget) { |
1650 | __netif_rx_complete(qdev->ndev, napi); | 1650 | __netif_rx_complete(napi); |
1651 | ql_enable_completion_interrupt(qdev, rx_ring->irq); | 1651 | ql_enable_completion_interrupt(qdev, rx_ring->irq); |
1652 | } | 1652 | } |
1653 | return work_done; | 1653 | return work_done; |
@@ -1733,7 +1733,7 @@ static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id) | |||
1733 | { | 1733 | { |
1734 | struct rx_ring *rx_ring = dev_id; | 1734 | struct rx_ring *rx_ring = dev_id; |
1735 | struct ql_adapter *qdev = rx_ring->qdev; | 1735 | struct ql_adapter *qdev = rx_ring->qdev; |
1736 | netif_rx_schedule(qdev->ndev, &rx_ring->napi); | 1736 | netif_rx_schedule(&rx_ring->napi); |
1737 | return IRQ_HANDLED; | 1737 | return IRQ_HANDLED; |
1738 | } | 1738 | } |
1739 | 1739 | ||
@@ -1819,8 +1819,7 @@ static irqreturn_t qlge_isr(int irq, void *dev_id) | |||
1819 | &rx_ring->rx_work, | 1819 | &rx_ring->rx_work, |
1820 | 0); | 1820 | 0); |
1821 | else | 1821 | else |
1822 | netif_rx_schedule(qdev->ndev, | 1822 | netif_rx_schedule(&rx_ring->napi); |
1823 | &rx_ring->napi); | ||
1824 | work_done++; | 1823 | work_done++; |
1825 | } | 1824 | } |
1826 | } | 1825 | } |