ia64/xen-unstable

changeset 1846:a10feaf36803

bitkeeper revision 1.1108.2.11 (40fe3d42Zl0VaD6XCO_s716MYM1VIQ)

Make the network interrupt handler work on 2.6.
author cl349@freefall.cl.cam.ac.uk
date Wed Jul 21 09:54:10 2004 +0000 (2004-07-21)
parents 567574707ca9
children f2435a0ddc1d
files linux-2.6.7-xen-sparse/drivers/xen/net/network.c
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/net/network.c	Tue Jul 20 11:05:08 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c	Wed Jul 21 09:54:10 2004 +0000
     1.3 @@ -371,7 +371,7 @@ static int network_start_xmit(struct sk_
     1.4  }
     1.5  
     1.6  
     1.7 -static void netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
     1.8 +static irqreturn_t netif_int(int irq, void *dev_id, struct pt_regs *ptregs)
     1.9  {
    1.10      struct net_device *dev = dev_id;
    1.11      struct net_private *np = dev->priv;
    1.12 @@ -384,6 +384,8 @@ static void netif_int(int irq, void *dev
    1.13      if ( (np->rx_resp_cons != np->rx->resp_prod) &&
    1.14           (np->user_state == UST_OPEN) )
    1.15          netif_rx_schedule(dev);
    1.16 +
    1.17 +    return IRQ_HANDLED;
    1.18  }
    1.19  
    1.20