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>
This commit is contained in:

committed by
David S. Miller

parent
889bd9b6db
commit
908a7a16b8
@@ -1515,7 +1515,7 @@ static int myri10ge_poll(struct napi_struct *napi, int budget)
|
||||
work_done = myri10ge_clean_rx_done(ss, budget);
|
||||
|
||||
if (work_done < budget) {
|
||||
netif_rx_complete(netdev, napi);
|
||||
netif_rx_complete(napi);
|
||||
put_be32(htonl(3), ss->irq_claim);
|
||||
}
|
||||
return work_done;
|
||||
@@ -1533,7 +1533,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
|
||||
/* an interrupt on a non-zero receive-only slice is implicitly
|
||||
* valid since MSI-X irqs are not shared */
|
||||
if ((mgp->dev->real_num_tx_queues == 1) && (ss != mgp->ss)) {
|
||||
netif_rx_schedule(ss->dev, &ss->napi);
|
||||
netif_rx_schedule(&ss->napi);
|
||||
return (IRQ_HANDLED);
|
||||
}
|
||||
|
||||
@@ -1544,7 +1544,7 @@ static irqreturn_t myri10ge_intr(int irq, void *arg)
|
||||
/* low bit indicates receives are present, so schedule
|
||||
* napi poll handler */
|
||||
if (stats->valid & 1)
|
||||
netif_rx_schedule(ss->dev, &ss->napi);
|
||||
netif_rx_schedule(&ss->napi);
|
||||
|
||||
if (!mgp->msi_enabled && !mgp->msix_enabled) {
|
||||
put_be32(0, mgp->irq_deassert);
|
||||
|
Reference in New Issue
Block a user