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/niu.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/niu.c')
-rw-r--r-- | drivers/net/niu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 0c0b752315ca..4a5a089fa301 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -3669,7 +3669,7 @@ static int niu_poll(struct napi_struct *napi, int budget) | |||
3669 | work_done = niu_poll_core(np, lp, budget); | 3669 | work_done = niu_poll_core(np, lp, budget); |
3670 | 3670 | ||
3671 | if (work_done < budget) { | 3671 | if (work_done < budget) { |
3672 | netif_rx_complete(napi); | 3672 | napi_complete(napi); |
3673 | niu_ldg_rearm(np, lp, 1); | 3673 | niu_ldg_rearm(np, lp, 1); |
3674 | } | 3674 | } |
3675 | return work_done; | 3675 | return work_done; |
@@ -4088,12 +4088,12 @@ static void __niu_fastpath_interrupt(struct niu *np, int ldg, u64 v0) | |||
4088 | static void niu_schedule_napi(struct niu *np, struct niu_ldg *lp, | 4088 | static void niu_schedule_napi(struct niu *np, struct niu_ldg *lp, |
4089 | u64 v0, u64 v1, u64 v2) | 4089 | u64 v0, u64 v1, u64 v2) |
4090 | { | 4090 | { |
4091 | if (likely(netif_rx_schedule_prep(&lp->napi))) { | 4091 | if (likely(napi_schedule_prep(&lp->napi))) { |
4092 | lp->v0 = v0; | 4092 | lp->v0 = v0; |
4093 | lp->v1 = v1; | 4093 | lp->v1 = v1; |
4094 | lp->v2 = v2; | 4094 | lp->v2 = v2; |
4095 | __niu_fastpath_interrupt(np, lp->ldg_num, v0); | 4095 | __niu_fastpath_interrupt(np, lp->ldg_num, v0); |
4096 | __netif_rx_schedule(&lp->napi); | 4096 | __napi_schedule(&lp->napi); |
4097 | } | 4097 | } |
4098 | } | 4098 | } |
4099 | 4099 | ||