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
@ -971,7 +971,7 @@ static irqreturn_t pasemi_mac_rx_intr(int irq, void *data)
|
||||
if (*chan->status & PAS_STATUS_ERROR)
|
||||
reg |= PAS_IOB_DMA_RXCH_RESET_DINTC;
|
||||
|
||||
netif_rx_schedule(dev, &mac->napi);
|
||||
netif_rx_schedule(&mac->napi);
|
||||
|
||||
write_iob_reg(PAS_IOB_DMA_RXCH_RESET(chan->chno), reg);
|
||||
|
||||
@ -1011,7 +1011,7 @@ static irqreturn_t pasemi_mac_tx_intr(int irq, void *data)
|
||||
|
||||
mod_timer(&txring->clean_timer, jiffies + (TX_CLEAN_INTERVAL)*2);
|
||||
|
||||
netif_rx_schedule(mac->netdev, &mac->napi);
|
||||
netif_rx_schedule(&mac->napi);
|
||||
|
||||
if (reg)
|
||||
write_iob_reg(PAS_IOB_DMA_TXCH_RESET(chan->chno), reg);
|
||||
@ -1641,7 +1641,7 @@ static int pasemi_mac_poll(struct napi_struct *napi, int budget)
|
||||
pkts = pasemi_mac_clean_rx(rx_ring(mac), budget);
|
||||
if (pkts < budget) {
|
||||
/* all done, no more packets present */
|
||||
netif_rx_complete(dev, napi);
|
||||
netif_rx_complete(napi);
|
||||
|
||||
pasemi_mac_restart_rx_intr(mac);
|
||||
pasemi_mac_restart_tx_intr(mac);
|
||||
|
Reference in New Issue
Block a user