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/ucc_geth.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/ucc_geth.c')
-rw-r--r-- | drivers/net/ucc_geth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 5c82f147f15..78a2ede19c5 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -3330,7 +3330,7 @@ static int ucc_geth_poll(struct napi_struct *napi, int budget) | |||
3330 | struct ucc_fast_private *uccf; | 3330 | struct ucc_fast_private *uccf; |
3331 | u32 uccm; | 3331 | u32 uccm; |
3332 | 3332 | ||
3333 | netif_rx_complete(dev, napi); | 3333 | netif_rx_complete(napi); |
3334 | uccf = ugeth->uccf; | 3334 | uccf = ugeth->uccf; |
3335 | uccm = in_be32(uccf->p_uccm); | 3335 | uccm = in_be32(uccf->p_uccm); |
3336 | uccm |= UCCE_RX_EVENTS; | 3336 | uccm |= UCCE_RX_EVENTS; |
@@ -3364,10 +3364,10 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info) | |||
3364 | 3364 | ||
3365 | /* check for receive events that require processing */ | 3365 | /* check for receive events that require processing */ |
3366 | if (ucce & UCCE_RX_EVENTS) { | 3366 | if (ucce & UCCE_RX_EVENTS) { |
3367 | if (netif_rx_schedule_prep(dev, &ugeth->napi)) { | 3367 | if (netif_rx_schedule_prep(&ugeth->napi)) { |
3368 | uccm &= ~UCCE_RX_EVENTS; | 3368 | uccm &= ~UCCE_RX_EVENTS; |
3369 | out_be32(uccf->p_uccm, uccm); | 3369 | out_be32(uccf->p_uccm, uccm); |
3370 | __netif_rx_schedule(dev, &ugeth->napi); | 3370 | __netif_rx_schedule(&ugeth->napi); |
3371 | } | 3371 | } |
3372 | } | 3372 | } |
3373 | 3373 | ||