Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv29836/drivers/net
Modified Files:
vaxlance.c
Log Message:
Interrupt handlers need to return an irqreturn_t in 2.5.69
Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/vaxlance.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vaxlance.c 23 Jan 2003 23:15:41 -0000 1.4
+++ vaxlance.c 28 Aug 2003 21:38:02 -0000 1.5
@@ -602,7 +602,7 @@
spin_unlock(&lp->lock);
}
-static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct lance_private *lp = (struct lance_private *) dev->priv;
@@ -614,7 +614,7 @@
if ((csr0 & LE_C0_INTR) == 0) {
/* Hmmm, not for us... */
- return;
+ return IRQ_HANDLED;
}
vsbus_clear_int(lp->vsbus_int);
@@ -661,6 +661,8 @@
/* FIXME: why is this really needed? */
writecsr0(ll, LE_C0_INEA);
+
+ return IRQ_HANDLED;
}
struct net_device *last_dev = 0;
|
