diff options
author | Neil Horman <nhorman@tuxdriver.com> | 2008-12-22 23:43:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-22 23:43:12 -0500 |
commit | 908a7a16b852ffd618a9127be8d62432182d81b4 (patch) | |
tree | a0b509227e26bef7edd347575761e0dbeb5756e7 /drivers/net/niu.c | |
parent | 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8 (diff) |
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-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 f219f16ec97a..5698c155bbf3 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(np->dev, napi); | 3672 | netif_rx_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(np->dev, &lp->napi))) { | 4091 | if (likely(netif_rx_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(np->dev, &lp->napi); | 4096 | __netif_rx_schedule(&lp->napi); |
4097 | } | 4097 | } |
4098 | } | 4098 | } |
4099 | 4099 | ||