aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qla3xxx.c
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2008-12-22 23:43:12 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-22 23:43:12 -0500
commit908a7a16b852ffd618a9127be8d62432182d81b4 (patch)
treea0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/qla3xxx.c
parent889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (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/qla3xxx.c')
-rw-r--r--drivers/net/qla3xxx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 6b7ed1a5b3b7..33e8e62b4502 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2293,7 +2293,7 @@ static int ql_poll(struct napi_struct *napi, int budget)
2293 2293
2294 if (tx_cleaned + rx_cleaned != budget) { 2294 if (tx_cleaned + rx_cleaned != budget) {
2295 spin_lock_irqsave(&qdev->hw_lock, hw_flags); 2295 spin_lock_irqsave(&qdev->hw_lock, hw_flags);
2296 __netif_rx_complete(ndev, napi); 2296 __netif_rx_complete(napi);
2297 ql_update_small_bufq_prod_index(qdev); 2297 ql_update_small_bufq_prod_index(qdev);
2298 ql_update_lrg_bufq_prod_index(qdev); 2298 ql_update_lrg_bufq_prod_index(qdev);
2299 writel(qdev->rsp_consumer_index, 2299 writel(qdev->rsp_consumer_index,
@@ -2352,8 +2352,8 @@ static irqreturn_t ql3xxx_isr(int irq, void *dev_id)
2352 spin_unlock(&qdev->adapter_lock); 2352 spin_unlock(&qdev->adapter_lock);
2353 } else if (value & ISP_IMR_DISABLE_CMPL_INT) { 2353 } else if (value & ISP_IMR_DISABLE_CMPL_INT) {
2354 ql_disable_interrupts(qdev); 2354 ql_disable_interrupts(qdev);
2355 if (likely(netif_rx_schedule_prep(ndev, &qdev->napi))) { 2355 if (likely(netif_rx_schedule_prep(&qdev->napi))) {
2356 __netif_rx_schedule(ndev, &qdev->napi); 2356 __netif_rx_schedule(&qdev->napi);
2357 } 2357 }
2358 } else { 2358 } else {
2359 return IRQ_NONE; 2359 return IRQ_NONE;