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
@ -888,7 +888,7 @@ static int tsi108_poll(struct napi_struct *napi, int budget)
|
||||
|
||||
if (num_received < budget) {
|
||||
data->rxpending = 0;
|
||||
netif_rx_complete(dev, napi);
|
||||
netif_rx_complete(napi);
|
||||
|
||||
TSI_WRITE(TSI108_EC_INTMASK,
|
||||
TSI_READ(TSI108_EC_INTMASK)
|
||||
@ -919,7 +919,7 @@ static void tsi108_rx_int(struct net_device *dev)
|
||||
* from tsi108_check_rxring().
|
||||
*/
|
||||
|
||||
if (netif_rx_schedule_prep(dev, &data->napi)) {
|
||||
if (netif_rx_schedule_prep(&data->napi)) {
|
||||
/* Mask, rather than ack, the receive interrupts. The ack
|
||||
* will happen in tsi108_poll().
|
||||
*/
|
||||
@ -930,7 +930,7 @@ static void tsi108_rx_int(struct net_device *dev)
|
||||
| TSI108_INT_RXTHRESH |
|
||||
TSI108_INT_RXOVERRUN | TSI108_INT_RXERROR |
|
||||
TSI108_INT_RXWAIT);
|
||||
__netif_rx_schedule(dev, &data->napi);
|
||||
__netif_rx_schedule(&data->napi);
|
||||
} else {
|
||||
if (!netif_running(dev)) {
|
||||
/* This can happen if an interrupt occurs while the
|
||||
|
Reference in New Issue
Block a user