net: Remove redundant NAPI functions
Following the removal of the unused struct net_device * parameter from
the NAPI functions named *netif_rx_* in commit 908a7a1
, they are
exactly equivalent to the corresponding *napi_* functions and are
therefore redundant.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-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
627af770c6
commit
288379f050
@@ -196,7 +196,7 @@ static void rx_refill_timeout(unsigned long data)
|
||||
{
|
||||
struct net_device *dev = (struct net_device *)data;
|
||||
struct netfront_info *np = netdev_priv(dev);
|
||||
netif_rx_schedule(&np->napi);
|
||||
napi_schedule(&np->napi);
|
||||
}
|
||||
|
||||
static int netfront_tx_slot_available(struct netfront_info *np)
|
||||
@@ -328,7 +328,7 @@ static int xennet_open(struct net_device *dev)
|
||||
xennet_alloc_rx_buffers(dev);
|
||||
np->rx.sring->rsp_event = np->rx.rsp_cons + 1;
|
||||
if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
|
||||
netif_rx_schedule(&np->napi);
|
||||
napi_schedule(&np->napi);
|
||||
}
|
||||
spin_unlock_bh(&np->rx_lock);
|
||||
|
||||
@@ -979,7 +979,7 @@ err:
|
||||
|
||||
RING_FINAL_CHECK_FOR_RESPONSES(&np->rx, more_to_do);
|
||||
if (!more_to_do)
|
||||
__netif_rx_complete(napi);
|
||||
__napi_complete(napi);
|
||||
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
@@ -1317,7 +1317,7 @@ static irqreturn_t xennet_interrupt(int irq, void *dev_id)
|
||||
xennet_tx_buf_gc(dev);
|
||||
/* Under tx_lock: protects access to rx shared-ring indexes. */
|
||||
if (RING_HAS_UNCONSUMED_RESPONSES(&np->rx))
|
||||
netif_rx_schedule(&np->napi);
|
||||
napi_schedule(&np->napi);
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&np->tx_lock, flags);
|
||||
|
Reference in New Issue
Block a user