aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-01-19 19:43:59 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-21 17:33:50 -0500
commit288379f050284087578b77e04f040b57db3db3f8 (patch)
treeac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/qlge
parent627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff)
net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from the NAPI functions named *netif_rx_* in commit 908a7a1, they are exactly equivalent to the corresponding *napi_* functions and are therefore redundant. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r--drivers/net/qlge/qlge_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 45421c8b6010..16eb9dd85286 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -1642,7 +1642,7 @@ static int ql_napi_poll_msix(struct napi_struct *napi, int budget)
1642 rx_ring->cq_id); 1642 rx_ring->cq_id);
1643 1643
1644 if (work_done < budget) { 1644 if (work_done < budget) {
1645 __netif_rx_complete(napi); 1645 __napi_complete(napi);
1646 ql_enable_completion_interrupt(qdev, rx_ring->irq); 1646 ql_enable_completion_interrupt(qdev, rx_ring->irq);
1647 } 1647 }
1648 return work_done; 1648 return work_done;
@@ -1727,7 +1727,7 @@ static irqreturn_t qlge_msix_tx_isr(int irq, void *dev_id)
1727static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id) 1727static irqreturn_t qlge_msix_rx_isr(int irq, void *dev_id)
1728{ 1728{
1729 struct rx_ring *rx_ring = dev_id; 1729 struct rx_ring *rx_ring = dev_id;
1730 netif_rx_schedule(&rx_ring->napi); 1730 napi_schedule(&rx_ring->napi);
1731 return IRQ_HANDLED; 1731 return IRQ_HANDLED;
1732} 1732}
1733 1733
@@ -1813,7 +1813,7 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
1813 &rx_ring->rx_work, 1813 &rx_ring->rx_work,
1814 0); 1814 0);
1815 else 1815 else
1816 netif_rx_schedule(&rx_ring->napi); 1816 napi_schedule(&rx_ring->napi);
1817 work_done++; 1817 work_done++;
1818 } 1818 }
1819 } 1819 }