win-pvdrivers

changeset 296:a507de94dedf wdm

merge of 263
author Andy Grover <andy.grover@oracle.com>
date Mon Jun 09 21:04:53 2008 -0700 (2008-06-09)
parents 626be056aed2 eccaff2083eb
children 4d8d52ae8d13 b2f5af0c80d2
files xennet/xennet_rx.c xennet/xennet_tx.c
line diff
     1.1 --- a/xennet/xennet_rx.c	Mon Jun 09 21:04:33 2008 -0700
     1.2 +++ b/xennet/xennet_rx.c	Mon Jun 09 21:04:53 2008 -0700
     1.3 @@ -29,7 +29,7 @@ XenNet_RxBufferAlloc(struct xennet_info 
     1.4    int i, batch_target, notify;
     1.5    RING_IDX req_prod = xi->rx.req_prod_pvt;
     1.6    netif_rx_request_t *req;
     1.7 -#ifdef DEBUG
     1.8 +#if DBG
     1.9    int cycles = 0;
    1.10  #endif
    1.11  #if defined(XEN_PROFILE)
    1.12 @@ -365,7 +365,7 @@ XenNet_RxBufferCheck(struct xennet_info 
    1.13    struct netif_rx_response *rxrsp = NULL;
    1.14    struct netif_extra_info *ei;
    1.15    USHORT id;
    1.16 -#ifdef DEBUG
    1.17 +#if DBG
    1.18    int cycles = 0;
    1.19  #endif
    1.20  #if defined(XEN_PROFILE)
    1.21 @@ -501,7 +501,7 @@ XenNet_ReturnPacket(
    1.22  {
    1.23    struct xennet_info *xi = MiniportAdapterContext;
    1.24    PMDL mdl;
    1.25 -#ifdef DEBUG
    1.26 +#if DBG
    1.27    int cycles = 0;
    1.28  #endif
    1.29  #if defined(XEN_PROFILE)
     2.1 --- a/xennet/xennet_tx.c	Mon Jun 09 21:04:33 2008 -0700
     2.2 +++ b/xennet/xennet_tx.c	Mon Jun 09 21:04:53 2008 -0700
     2.3 @@ -252,7 +252,7 @@ XenNet_SendQueuedPackets(struct xennet_i
     2.4    LARGE_INTEGER tsc, dummy;
     2.5  #endif
     2.6  
     2.7 -#ifdef DEBUG
     2.8 +#if DBG
     2.9    int cycles = 0;
    2.10  #endif
    2.11    BOOLEAN success;
    2.12 @@ -299,7 +299,7 @@ XenNet_TxBufferGC(struct xennet_info *xi
    2.13    ULONG packet_count = 0;
    2.14    int moretodo;
    2.15    ULONG i;
    2.16 -#ifdef DEBUG
    2.17 +#if DBG
    2.18    int cycles = 0;
    2.19  #endif
    2.20  #if defined(XEN_PROFILE)