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/via-rhine.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/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 3b8e63254277..4671436ecf0e 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -589,7 +589,7 @@ static int rhine_napipoll(struct napi_struct *napi, int budget) | |||
589 | work_done = rhine_rx(dev, budget); | 589 | work_done = rhine_rx(dev, budget); |
590 | 590 | ||
591 | if (work_done < budget) { | 591 | if (work_done < budget) { |
592 | netif_rx_complete(napi); | 592 | napi_complete(napi); |
593 | 593 | ||
594 | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | | 594 | iowrite16(IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | |
595 | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | | 595 | IntrRxDropped | IntrRxNoBuf | IntrTxAborted | |
@@ -1319,7 +1319,7 @@ static irqreturn_t rhine_interrupt(int irq, void *dev_instance) | |||
1319 | IntrPCIErr | IntrStatsMax | IntrLinkChange, | 1319 | IntrPCIErr | IntrStatsMax | IntrLinkChange, |
1320 | ioaddr + IntrEnable); | 1320 | ioaddr + IntrEnable); |
1321 | 1321 | ||
1322 | netif_rx_schedule(&rp->napi); | 1322 | napi_schedule(&rp->napi); |
1323 | } | 1323 | } |
1324 | 1324 | ||
1325 | if (intr_status & (IntrTxErrSummary | IntrTxDone)) { | 1325 | if (intr_status & (IntrTxErrSummary | IntrTxDone)) { |