diff options
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 c5dec54251bf..c23a58624a33 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -2198,10 +2198,10 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) | |||
2198 | 2198 | ||
2199 | prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); | 2199 | prefetch(&np->rx_skbuff[np->cur_rx % RX_RING_SIZE]); |
2200 | 2200 | ||
2201 | if (netif_rx_schedule_prep(&np->napi)) { | 2201 | if (napi_schedule_prep(&np->napi)) { |
2202 | /* Disable interrupts and register for poll */ | 2202 | /* Disable interrupts and register for poll */ |
2203 | natsemi_irq_disable(dev); | 2203 | natsemi_irq_disable(dev); |
2204 | __netif_rx_schedule(&np->napi); | 2204 | __napi_schedule(&np->napi); |
2205 | } else | 2205 | } else |
2206 | printk(KERN_WARNING | 2206 | printk(KERN_WARNING |
2207 | "%s: Ignoring interrupt, status %#08x, mask %#08x.\n", | 2207 | "%s: Ignoring interrupt, status %#08x, mask %#08x.\n", |
@@ -2253,7 +2253,7 @@ static int natsemi_poll(struct napi_struct *napi, int budget) | |||
2253 | np->intr_status = readl(ioaddr + IntrStatus); | 2253 | np->intr_status = readl(ioaddr + IntrStatus); |
2254 | } while (np->intr_status); | 2254 | } while (np->intr_status); |
2255 | 2255 | ||
2256 | netif_rx_complete(napi); | 2256 | napi_complete(napi); |
2257 | 2257 | ||
2258 | /* Reenable interrupts providing nothing is trying to shut | 2258 | /* Reenable interrupts providing nothing is trying to shut |
2259 | * the chip down. */ | 2259 | * the chip down. */ |