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
@@ -473,7 +473,7 @@ static void eth_rx_irq(void *pdev)
|
||||
printk(KERN_DEBUG "%s: eth_rx_irq\n", dev->name);
|
||||
#endif
|
||||
qmgr_disable_irq(port->plat->rxq);
|
||||
netif_rx_schedule(&port->napi);
|
||||
napi_schedule(&port->napi);
|
||||
}
|
||||
|
||||
static int eth_poll(struct napi_struct *napi, int budget)
|
||||
@@ -498,16 +498,16 @@ static int eth_poll(struct napi_struct *napi, int budget)
|
||||
|
||||
if ((n = queue_get_desc(rxq, port, 0)) < 0) {
|
||||
#if DEBUG_RX
|
||||
printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n",
|
||||
printk(KERN_DEBUG "%s: eth_poll napi_complete\n",
|
||||
dev->name);
|
||||
#endif
|
||||
netif_rx_complete(napi);
|
||||
napi_complete(napi);
|
||||
qmgr_enable_irq(rxq);
|
||||
if (!qmgr_stat_empty(rxq) &&
|
||||
netif_rx_reschedule(napi)) {
|
||||
napi_reschedule(napi)) {
|
||||
#if DEBUG_RX
|
||||
printk(KERN_DEBUG "%s: eth_poll"
|
||||
" netif_rx_reschedule successed\n",
|
||||
" napi_reschedule successed\n",
|
||||
dev->name);
|
||||
#endif
|
||||
qmgr_disable_irq(rxq);
|
||||
@@ -1036,7 +1036,7 @@ static int eth_open(struct net_device *dev)
|
||||
}
|
||||
ports_open++;
|
||||
/* we may already have RX data, enables IRQ */
|
||||
netif_rx_schedule(&port->napi);
|
||||
napi_schedule(&port->napi);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user