projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
net
/
ixp2000
/
ixpdev.c
diff --git
a/drivers/net/ixp2000/ixpdev.c
b/drivers/net/ixp2000/ixpdev.c
index
52c5a1c
..
77f104a
100644
(file)
--- a/
drivers/net/ixp2000/ixpdev.c
+++ b/
drivers/net/ixp2000/ixpdev.c
@@
-16,7
+16,7
@@
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
-#include <asm/
arch
/uengine.h>
+#include <asm/
hardware
/uengine.h>
#include <asm/mach-types.h>
#include <asm/io.h>
#include "ixp2400_rx.ucode"
#include <asm/mach-types.h>
#include <asm/io.h>
#include "ixp2400_rx.ucode"
@@
-202,7
+202,7
@@
static irqreturn_t ixpdev_interrupt(int irq, void *dev_id, struct pt_regs *regs)
*/
if (status & 0x00ff) {
ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
*/
if (status & 0x00ff) {
ixp2000_reg_wrb(IXP2000_IRQ_THD_ENABLE_CLEAR_A_0, 0x00ff);
- if (likely(
netif_rx_schedule_test
(nds[0]))) {
+ if (likely(
__netif_rx_schedule_prep
(nds[0]))) {
__netif_rx_schedule(nds[0]);
} else {
printk(KERN_CRIT "ixp2000: irq while polling!!\n");
__netif_rx_schedule(nds[0]);
} else {
printk(KERN_CRIT "ixp2000: irq while polling!!\n");