git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: convert cs89x0 to net_device_ops
[safe/jmp/linux-2.6]
/
drivers
/
net
/
tc35815.c
diff --git
a/drivers/net/tc35815.c
b/drivers/net/tc35815.c
index
e1f8eb9
..
b52a1c0
100644
(file)
--- a/
drivers/net/tc35815.c
+++ b/
drivers/net/tc35815.c
@@
-1609,8
+1609,8
@@
static irqreturn_t tc35815_interrupt(int irq, void *dev_id)
if (!(dmactl & DMA_IntMask)) {
/* disable interrupts */
tc_writel(dmactl | DMA_IntMask, &tr->DMA_Ctl);
if (!(dmactl & DMA_IntMask)) {
/* disable interrupts */
tc_writel(dmactl | DMA_IntMask, &tr->DMA_Ctl);
- if (n
etif_rx
_schedule_prep(&lp->napi))
- __n
etif_rx
_schedule(&lp->napi);
+ if (n
api
_schedule_prep(&lp->napi))
+ __n
api
_schedule(&lp->napi);
else {
printk(KERN_ERR "%s: interrupt taken in poll\n",
dev->name);
else {
printk(KERN_ERR "%s: interrupt taken in poll\n",
dev->name);
@@
-1919,7
+1919,7
@@
static int tc35815_poll(struct napi_struct *napi, int budget)
spin_unlock(&lp->lock);
if (received < budget) {
spin_unlock(&lp->lock);
if (received < budget) {
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
/* enable interrupts */
tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl);
}
/* enable interrupts */
tc_writel(tc_readl(&tr->DMA_Ctl) & ~DMA_IntMask, &tr->DMA_Ctl);
}