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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
amd8111e.c
diff --git
a/drivers/net/amd8111e.c
b/drivers/net/amd8111e.c
index
7709992
..
cb9c95d
100644
(file)
--- a/
drivers/net/amd8111e.c
+++ b/
drivers/net/amd8111e.c
@@
-831,7
+831,7
@@
static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
if (rx_pkt_limit > 0) {
/* Receive descriptor is empty now */
spin_lock_irqsave(&lp->lock, flags);
if (rx_pkt_limit > 0) {
/* Receive descriptor is empty now */
spin_lock_irqsave(&lp->lock, flags);
- __n
etif_rx
_complete(napi);
+ __n
api
_complete(napi);
writel(VAL0|RINTEN0, mmio + INTEN0);
writel(VAL2 | RDMD0, mmio + CMD0);
spin_unlock_irqrestore(&lp->lock, flags);
writel(VAL0|RINTEN0, mmio + INTEN0);
writel(VAL2 | RDMD0, mmio + CMD0);
spin_unlock_irqrestore(&lp->lock, flags);
@@
-1170,11
+1170,11
@@
static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)
/* Check if Receive Interrupt has occurred. */
if (intr0 & RINT0) {
/* Check if Receive Interrupt has occurred. */
if (intr0 & RINT0) {
- if (n
etif_rx
_schedule_prep(&lp->napi)) {
+ if (n
api
_schedule_prep(&lp->napi)) {
/* Disable receive interupts */
writel(RINTEN0, mmio + INTEN0);
/* Schedule a polling routine */
/* Disable receive interupts */
writel(RINTEN0, mmio + INTEN0);
/* Schedule a polling routine */
- __n
etif_rx
_schedule(&lp->napi);
+ __n
api
_schedule(&lp->napi);
} else if (intren0 & RINTEN0) {
printk("************Driver bug! \
interrupt while in poll\n");
} else if (intren0 & RINTEN0) {
printk("************Driver bug! \
interrupt while in poll\n");