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/cpmac.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/cpmac.c')
-rw-r--r-- | drivers/net/cpmac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index d39a77cba1af..f66548751c38 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
@@ -428,7 +428,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget) | |||
428 | printk(KERN_WARNING "%s: rx: polling, but no queue\n", | 428 | printk(KERN_WARNING "%s: rx: polling, but no queue\n", |
429 | priv->dev->name); | 429 | priv->dev->name); |
430 | spin_unlock(&priv->rx_lock); | 430 | spin_unlock(&priv->rx_lock); |
431 | netif_rx_complete(priv->dev, napi); | 431 | netif_rx_complete(napi); |
432 | return 0; | 432 | return 0; |
433 | } | 433 | } |
434 | 434 | ||
@@ -514,7 +514,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget) | |||
514 | if (processed == 0) { | 514 | if (processed == 0) { |
515 | /* we ran out of packets to read, | 515 | /* we ran out of packets to read, |
516 | * revert to interrupt-driven mode */ | 516 | * revert to interrupt-driven mode */ |
517 | netif_rx_complete(priv->dev, napi); | 517 | netif_rx_complete(napi); |
518 | cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1); | 518 | cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1); |
519 | return 0; | 519 | return 0; |
520 | } | 520 | } |
@@ -536,7 +536,7 @@ fatal_error: | |||
536 | } | 536 | } |
537 | 537 | ||
538 | spin_unlock(&priv->rx_lock); | 538 | spin_unlock(&priv->rx_lock); |
539 | netif_rx_complete(priv->dev, napi); | 539 | netif_rx_complete(napi); |
540 | netif_tx_stop_all_queues(priv->dev); | 540 | netif_tx_stop_all_queues(priv->dev); |
541 | napi_disable(&priv->napi); | 541 | napi_disable(&priv->napi); |
542 | 542 | ||
@@ -802,9 +802,9 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id) | |||
802 | 802 | ||
803 | if (status & MAC_INT_RX) { | 803 | if (status & MAC_INT_RX) { |
804 | queue = (status >> 8) & 7; | 804 | queue = (status >> 8) & 7; |
805 | if (netif_rx_schedule_prep(dev, &priv->napi)) { | 805 | if (netif_rx_schedule_prep(&priv->napi)) { |
806 | cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue); | 806 | cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 1 << queue); |
807 | __netif_rx_schedule(dev, &priv->napi); | 807 | __netif_rx_schedule(&priv->napi); |
808 | } | 808 | } |
809 | } | 809 | } |
810 | 810 | ||