diff options
Diffstat (limited to 'drivers/net/starfire.c')
-rw-r--r-- | drivers/net/starfire.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index da3a76b18eff..98fe79515bab 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1342,8 +1342,8 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) | |||
1342 | if (intr_status & (IntrRxDone | IntrRxEmpty)) { | 1342 | if (intr_status & (IntrRxDone | IntrRxEmpty)) { |
1343 | u32 enable; | 1343 | u32 enable; |
1344 | 1344 | ||
1345 | if (likely(netif_rx_schedule_prep(&np->napi))) { | 1345 | if (likely(napi_schedule_prep(&np->napi))) { |
1346 | __netif_rx_schedule(&np->napi); | 1346 | __napi_schedule(&np->napi); |
1347 | enable = readl(ioaddr + IntrEnable); | 1347 | enable = readl(ioaddr + IntrEnable); |
1348 | enable &= ~(IntrRxDone | IntrRxEmpty); | 1348 | enable &= ~(IntrRxDone | IntrRxEmpty); |
1349 | writel(enable, ioaddr + IntrEnable); | 1349 | writel(enable, ioaddr + IntrEnable); |
@@ -1587,7 +1587,7 @@ static int netdev_poll(struct napi_struct *napi, int budget) | |||
1587 | intr_status = readl(ioaddr + IntrStatus); | 1587 | intr_status = readl(ioaddr + IntrStatus); |
1588 | } while (intr_status & (IntrRxDone | IntrRxEmpty)); | 1588 | } while (intr_status & (IntrRxDone | IntrRxEmpty)); |
1589 | 1589 | ||
1590 | netif_rx_complete(napi); | 1590 | napi_complete(napi); |
1591 | intr_status = readl(ioaddr + IntrEnable); | 1591 | intr_status = readl(ioaddr + IntrEnable); |
1592 | intr_status |= IntrRxDone | IntrRxEmpty; | 1592 | intr_status |= IntrRxDone | IntrRxEmpty; |
1593 | writel(intr_status, ioaddr + IntrEnable); | 1593 | writel(intr_status, ioaddr + IntrEnable); |