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/e100.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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 86bb876fb123..861d2eeaa43c 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1944,9 +1944,9 @@ static irqreturn_t e100_intr(int irq, void *dev_id) | |||
1944 | if (stat_ack & stat_ack_rnr) | 1944 | if (stat_ack & stat_ack_rnr) |
1945 | nic->ru_running = RU_SUSPENDED; | 1945 | nic->ru_running = RU_SUSPENDED; |
1946 | 1946 | ||
1947 | if (likely(netif_rx_schedule_prep(&nic->napi))) { | 1947 | if (likely(napi_schedule_prep(&nic->napi))) { |
1948 | e100_disable_irq(nic); | 1948 | e100_disable_irq(nic); |
1949 | __netif_rx_schedule(&nic->napi); | 1949 | __napi_schedule(&nic->napi); |
1950 | } | 1950 | } |
1951 | 1951 | ||
1952 | return IRQ_HANDLED; | 1952 | return IRQ_HANDLED; |
@@ -1962,7 +1962,7 @@ static int e100_poll(struct napi_struct *napi, int budget) | |||
1962 | 1962 | ||
1963 | /* If budget not fully consumed, exit the polling mode */ | 1963 | /* If budget not fully consumed, exit the polling mode */ |
1964 | if (work_done < budget) { | 1964 | if (work_done < budget) { |
1965 | netif_rx_complete(napi); | 1965 | napi_complete(napi); |
1966 | e100_enable_irq(nic); | 1966 | e100_enable_irq(nic); |
1967 | } | 1967 | } |
1968 | 1968 | ||