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/natsemi.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/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 9f81fcb96882..478edb92bca3 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -2193,10 +2193,10 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) | |||
2193 | 2193 | ||
2194 | prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); | 2194 | prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); |
2195 | 2195 | ||
2196 | if (netif_rx_schedule_prep(dev, &np->napi)) { | 2196 | if (netif_rx_schedule_prep(&np->napi)) { |
2197 | /* Disable interrupts and register for poll */ | 2197 | /* Disable interrupts and register for poll */ |
2198 | natsemi_irq_disable(dev); | 2198 | natsemi_irq_disable(dev); |
2199 | __netif_rx_schedule(dev, &np->napi); | 2199 | __netif_rx_schedule(&np->napi); |
2200 | } else | 2200 | } else |
2201 | printk(KERN_WARNING | 2201 | printk(KERN_WARNING |
2202 | "%s: Ignoring interrupt, status %#08x, mask %#08x.\n", | 2202 | "%s: Ignoring interrupt, status %#08x, mask %#08x.\n", |
@@ -2248,7 +2248,7 @@ static int natsemi_poll(struct napi_struct *napi, int budget) | |||
2248 | np->intr_status = readl(ioaddr + IntrStatus); | 2248 | np->intr_status = readl(ioaddr + IntrStatus); |
2249 | } while (np->intr_status); | 2249 | } while (np->intr_status); |
2250 | 2250 | ||
2251 | netif_rx_complete(dev, napi); | 2251 | netif_rx_complete(napi); |
2252 | 2252 | ||
2253 | /* Reenable interrupts providing nothing is trying to shut | 2253 | /* Reenable interrupts providing nothing is trying to shut |
2254 | * the chip down. */ | 2254 | * the chip down. */ |