ia64/xen-unstable

changeset 1861:24ecbb3a55bb

bitkeeper revision 1.1108.2.15 (40ff33fcDdRyFamnRyk6CUWIiB0rGw)

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 Thu Jul 22 03:26:52 2004 +0000 (2004-07-22)
parents 1ea6f810ebb8 16fdd22af874
children 7dfcc8e95495 c6f221100673 591dac939c85
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	Wed Jul 21 14:56:49 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c	Thu Jul 22 03:26:52 2004 +0000
     1.3 @@ -275,6 +275,9 @@ static void network_alloc_rx_buffers(str
     1.4      }
     1.5      while ( (++i - np->rx_resp_cons) != NETIF_RX_RING_SIZE );
     1.6  
     1.7 +    if ( unlikely(nr_pfns == 0) )
     1.8 +        return;
     1.9 +
    1.10      /*
    1.11       * We may have allocated buffers which have entries outstanding in the page
    1.12       * update queue -- make sure we flush those first!