git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: Enable MIB and TIM interrupts for station mode.
[pandora-kernel.git]
/
drivers
/
net
/
starfire.c
diff --git
a/drivers/net/starfire.c
b/drivers/net/starfire.c
index
da3a76b
..
98fe795
100644
(file)
--- a/
drivers/net/starfire.c
+++ b/
drivers/net/starfire.c
@@
-1342,8
+1342,8
@@
static irqreturn_t intr_handler(int irq, void *dev_instance)
if (intr_status & (IntrRxDone | IntrRxEmpty)) {
u32 enable;
if (intr_status & (IntrRxDone | IntrRxEmpty)) {
u32 enable;
- if (likely(n
etif_rx
_schedule_prep(&np->napi))) {
- __n
etif_rx
_schedule(&np->napi);
+ if (likely(n
api
_schedule_prep(&np->napi))) {
+ __n
api
_schedule(&np->napi);
enable = readl(ioaddr + IntrEnable);
enable &= ~(IntrRxDone | IntrRxEmpty);
writel(enable, ioaddr + IntrEnable);
enable = readl(ioaddr + IntrEnable);
enable &= ~(IntrRxDone | IntrRxEmpty);
writel(enable, ioaddr + IntrEnable);
@@
-1587,7
+1587,7
@@
static int netdev_poll(struct napi_struct *napi, int budget)
intr_status = readl(ioaddr + IntrStatus);
} while (intr_status & (IntrRxDone | IntrRxEmpty));
intr_status = readl(ioaddr + IntrStatus);
} while (intr_status & (IntrRxDone | IntrRxEmpty));
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
intr_status = readl(ioaddr + IntrEnable);
intr_status |= IntrRxDone | IntrRxEmpty;
writel(intr_status, ioaddr + IntrEnable);
intr_status = readl(ioaddr + IntrEnable);
intr_status |= IntrRxDone | IntrRxEmpty;
writel(intr_status, ioaddr + IntrEnable);