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
@@ -1721,14 +1721,14 @@ ixgb_intr(int irq, void *data)
|
||||
if (!test_bit(__IXGB_DOWN, &adapter->flags))
|
||||
mod_timer(&adapter->watchdog_timer, jiffies);
|
||||
|
||||
if (netif_rx_schedule_prep(&adapter->napi)) {
|
||||
if (napi_schedule_prep(&adapter->napi)) {
|
||||
|
||||
/* Disable interrupts and register for poll. The flush
|
||||
of the posted write is intentionally left out.
|
||||
*/
|
||||
|
||||
IXGB_WRITE_REG(&adapter->hw, IMC, ~0);
|
||||
__netif_rx_schedule(&adapter->napi);
|
||||
__napi_schedule(&adapter->napi);
|
||||
}
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
@@ -1749,7 +1749,7 @@ ixgb_clean(struct napi_struct *napi, int budget)
|
||||
|
||||
/* If budget not fully consumed, exit the polling mode */
|
||||
if (work_done < budget) {
|
||||
netif_rx_complete(napi);
|
||||
napi_complete(napi);
|
||||
if (!test_bit(__IXGB_DOWN, &adapter->flags))
|
||||
ixgb_irq_enable(adapter);
|
||||
}
|
||||
|
Reference in New Issue
Block a user