diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-19 19:43:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:33:50 -0500 |
commit | 288379f050284087578b77e04f040b57db3db3f8 (patch) | |
tree | ac5f5c83e2778a1966327d87316fc94067363b45 /drivers/net/arm/ixp4xx_eth.c | |
parent | 627af770c63acddc2402dd19fec70df5c3ad8ab7 (diff) |
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>
Diffstat (limited to 'drivers/net/arm/ixp4xx_eth.c')
-rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 5fce1d5c1a1a..5fe17d5eaa54 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
@@ -473,7 +473,7 @@ static void eth_rx_irq(void *pdev) | |||
473 | printk(KERN_DEBUG "%s: eth_rx_irq\n", dev->name); | 473 | printk(KERN_DEBUG "%s: eth_rx_irq\n", dev->name); |
474 | #endif | 474 | #endif |
475 | qmgr_disable_irq(port->plat->rxq); | 475 | qmgr_disable_irq(port->plat->rxq); |
476 | netif_rx_schedule(&port->napi); | 476 | napi_schedule(&port->napi); |
477 | } | 477 | } |
478 | 478 | ||
479 | static int eth_poll(struct napi_struct *napi, int budget) | 479 | static int eth_poll(struct napi_struct *napi, int budget) |
@@ -498,16 +498,16 @@ static int eth_poll(struct napi_struct *napi, int budget) | |||
498 | 498 | ||
499 | if ((n = queue_get_desc(rxq, port, 0)) < 0) { | 499 | if ((n = queue_get_desc(rxq, port, 0)) < 0) { |
500 | #if DEBUG_RX | 500 | #if DEBUG_RX |
501 | printk(KERN_DEBUG "%s: eth_poll netif_rx_complete\n", | 501 | printk(KERN_DEBUG "%s: eth_poll napi_complete\n", |
502 | dev->name); | 502 | dev->name); |
503 | #endif | 503 | #endif |
504 | netif_rx_complete(napi); | 504 | napi_complete(napi); |
505 | qmgr_enable_irq(rxq); | 505 | qmgr_enable_irq(rxq); |
506 | if (!qmgr_stat_empty(rxq) && | 506 | if (!qmgr_stat_empty(rxq) && |
507 | netif_rx_reschedule(napi)) { | 507 | napi_reschedule(napi)) { |
508 | #if DEBUG_RX | 508 | #if DEBUG_RX |
509 | printk(KERN_DEBUG "%s: eth_poll" | 509 | printk(KERN_DEBUG "%s: eth_poll" |
510 | " netif_rx_reschedule successed\n", | 510 | " napi_reschedule successed\n", |
511 | dev->name); | 511 | dev->name); |
512 | #endif | 512 | #endif |
513 | qmgr_disable_irq(rxq); | 513 | qmgr_disable_irq(rxq); |
@@ -1036,7 +1036,7 @@ static int eth_open(struct net_device *dev) | |||
1036 | } | 1036 | } |
1037 | ports_open++; | 1037 | ports_open++; |
1038 | /* we may already have RX data, enables IRQ */ | 1038 | /* we may already have RX data, enables IRQ */ |
1039 | netif_rx_schedule(&port->napi); | 1039 | napi_schedule(&port->napi); |
1040 | return 0; | 1040 | return 0; |
1041 | } | 1041 | } |
1042 | 1042 | ||