ia64/xen-unstable

changeset 1756:ba1f4ebe0154

bitkeeper revision 1.1069 (40f2be1dQm0Goyt73MjStsGleH52zw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
author kaf24@scramble.cl.cam.ac.uk
date Mon Jul 12 16:36:45 2004 +0000 (2004-07-12)
parents 095e969226c4 1737fd2e4368
children cbf1c89cb69b
files linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c	Mon Jul 12 16:32:35 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/main.c	Mon Jul 12 16:36:45 2004 +0000
     1.3 @@ -495,7 +495,7 @@ static void net_tx_action(unsigned long 
     1.4  
     1.5          pending_idx = pending_ring[MASK_PEND_IDX(pending_cons)];
     1.6  
     1.7 -        if ( unlikely((skb = alloc_skb(PKT_PROT_LEN, GFP_ATOMIC)) == NULL) )
     1.8 +        if ( unlikely((skb = dev_alloc_skb(PKT_PROT_LEN)) == NULL) )
     1.9          {
    1.10              DPRINTK("Can't allocate a skb in start_xmit.\n");
    1.11              make_tx_response(netif, txreq.id, NETIF_RSP_ERROR);