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/epic100.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/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 4a951b8cb4d7..f9b37c80dda6 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -1109,9 +1109,9 @@ static irqreturn_t epic_interrupt(int irq, void *dev_instance) | |||
1109 | 1109 | ||
1110 | if ((status & EpicNapiEvent) && !ep->reschedule_in_poll) { | 1110 | if ((status & EpicNapiEvent) && !ep->reschedule_in_poll) { |
1111 | spin_lock(&ep->napi_lock); | 1111 | spin_lock(&ep->napi_lock); |
1112 | if (netif_rx_schedule_prep(dev, &ep->napi)) { | 1112 | if (netif_rx_schedule_prep(&ep->napi)) { |
1113 | epic_napi_irq_off(dev, ep); | 1113 | epic_napi_irq_off(dev, ep); |
1114 | __netif_rx_schedule(dev, &ep->napi); | 1114 | __netif_rx_schedule(&ep->napi); |
1115 | } else | 1115 | } else |
1116 | ep->reschedule_in_poll++; | 1116 | ep->reschedule_in_poll++; |
1117 | spin_unlock(&ep->napi_lock); | 1117 | spin_unlock(&ep->napi_lock); |
@@ -1288,7 +1288,7 @@ rx_action: | |||
1288 | 1288 | ||
1289 | more = ep->reschedule_in_poll; | 1289 | more = ep->reschedule_in_poll; |
1290 | if (!more) { | 1290 | if (!more) { |
1291 | __netif_rx_complete(dev, napi); | 1291 | __netif_rx_complete(napi); |
1292 | outl(EpicNapiEvent, ioaddr + INTSTAT); | 1292 | outl(EpicNapiEvent, ioaddr + INTSTAT); |
1293 | epic_napi_irq_on(dev, ep); | 1293 | epic_napi_irq_on(dev, ep); |
1294 | } else | 1294 | } else |