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
@@ -1607,9 +1607,9 @@ static int gfar_clean_tx_ring(struct net_device *dev)
|
||||
static void gfar_schedule_cleanup(struct net_device *dev)
|
||||
{
|
||||
struct gfar_private *priv = netdev_priv(dev);
|
||||
if (netif_rx_schedule_prep(dev, &priv->napi)) {
|
||||
if (netif_rx_schedule_prep(&priv->napi)) {
|
||||
gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED);
|
||||
__netif_rx_schedule(dev, &priv->napi);
|
||||
__netif_rx_schedule(&priv->napi);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1863,7 +1863,7 @@ static int gfar_poll(struct napi_struct *napi, int budget)
|
||||
return budget;
|
||||
|
||||
if (rx_cleaned < budget) {
|
||||
netif_rx_complete(dev, napi);
|
||||
netif_rx_complete(napi);
|
||||
|
||||
/* Clear the halt bit in RSTAT */
|
||||
gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT);
|
||||
|
Reference in New Issue
Block a user