diff options
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/interrupt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index 6c3428a37c0b..9f946d421088 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
@@ -103,7 +103,7 @@ void oom_timer(unsigned long data) | |||
103 | { | 103 | { |
104 | struct net_device *dev = (struct net_device *)data; | 104 | struct net_device *dev = (struct net_device *)data; |
105 | struct tulip_private *tp = netdev_priv(dev); | 105 | struct tulip_private *tp = netdev_priv(dev); |
106 | netif_rx_schedule(&tp->napi); | 106 | napi_schedule(&tp->napi); |
107 | } | 107 | } |
108 | 108 | ||
109 | int tulip_poll(struct napi_struct *napi, int budget) | 109 | int tulip_poll(struct napi_struct *napi, int budget) |
@@ -300,7 +300,7 @@ int tulip_poll(struct napi_struct *napi, int budget) | |||
300 | 300 | ||
301 | /* Remove us from polling list and enable RX intr. */ | 301 | /* Remove us from polling list and enable RX intr. */ |
302 | 302 | ||
303 | netif_rx_complete(napi); | 303 | napi_complete(napi); |
304 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7); | 304 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs, tp->base_addr+CSR7); |
305 | 305 | ||
306 | /* The last op happens after poll completion. Which means the following: | 306 | /* The last op happens after poll completion. Which means the following: |
@@ -333,10 +333,10 @@ int tulip_poll(struct napi_struct *napi, int budget) | |||
333 | 333 | ||
334 | /* Think: timer_pending() was an explicit signature of bug. | 334 | /* Think: timer_pending() was an explicit signature of bug. |
335 | * Timer can be pending now but fired and completed | 335 | * Timer can be pending now but fired and completed |
336 | * before we did netif_rx_complete(). See? We would lose it. */ | 336 | * before we did napi_complete(). See? We would lose it. */ |
337 | 337 | ||
338 | /* remove ourselves from the polling list */ | 338 | /* remove ourselves from the polling list */ |
339 | netif_rx_complete(napi); | 339 | napi_complete(napi); |
340 | 340 | ||
341 | return work_done; | 341 | return work_done; |
342 | } | 342 | } |
@@ -519,7 +519,7 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance) | |||
519 | rxd++; | 519 | rxd++; |
520 | /* Mask RX intrs and add the device to poll list. */ | 520 | /* Mask RX intrs and add the device to poll list. */ |
521 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ioaddr + CSR7); | 521 | iowrite32(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ioaddr + CSR7); |
522 | netif_rx_schedule(&tp->napi); | 522 | napi_schedule(&tp->napi); |
523 | 523 | ||
524 | if (!(csr5&~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass))) | 524 | if (!(csr5&~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass))) |
525 | break; | 525 | break; |