win-pvdrivers

changeset 84:9afa5fd5e5b2

Merge with head
author James Harper <james.harper@bendigoit.com.au>
date Tue Jan 01 13:54:15 2008 +1100 (2008-01-01)
parents 449304b11e61 9afafc0eae1d
children fa61e0b63dd6
files xennet/xennet.c
line diff
     1.1 --- a/xennet/xennet.c	Tue Jan 01 13:51:14 2008 +1100
     1.2 +++ b/xennet/xennet.c	Tue Jan 01 13:54:15 2008 +1100
     1.3 @@ -165,7 +165,6 @@ XenNet_TxBufferGC(struct xennet_info *xi
     1.4    unsigned short id;
     1.5    PNDIS_PACKET pkt;
     1.6    PMDL pmdl;
     1.7 -  int notify;
     1.8  
     1.9    ASSERT(xi->connected);
    1.10  
    1.11 @@ -212,14 +211,7 @@ XenNet_TxBufferGC(struct xennet_info *xi
    1.12        prod + ((xi->tx.sring->req_prod - prod) >> 1) + 1;
    1.13      KeMemoryBarrier();
    1.14    } while ((cons == prod) && (prod != xi->tx.sring->rsp_prod));
    1.15 -/*
    1.16 -  RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&xi->tx, notify);
    1.17 -  if (notify)
    1.18 -  {
    1.19 -    xi->XenInterface.EvtChn_Notify(xi->XenInterface.InterfaceHeader.Context,
    1.20 -      xi->event_channel);
    1.21 -  }
    1.22 -*/
    1.23 +
    1.24    /* if queued packets, send them now?
    1.25    network_maybe_wake_tx(dev); */
    1.26  
    1.27 @@ -396,7 +388,7 @@ XenNet_Interrupt(
    1.28  
    1.29  //  KdPrint((__DRIVER_NAME " --> " __FUNCTION__ "\n"));
    1.30  
    1.31 -  KeAcquireSpinLock(xi->Lock, &OldIrql);
    1.32 +  KeAcquireSpinLock(&xi->Lock, &OldIrql);
    1.33  
    1.34    //KdPrint((__DRIVER_NAME "     ***XenNet Interrupt***\n"));  
    1.35  
    1.36 @@ -406,7 +398,7 @@ XenNet_Interrupt(
    1.37      XenNet_RxBufferCheck(xi);
    1.38    }
    1.39  
    1.40 -  KeReleaseSpinLock(xi->Lock, OldIrql);
    1.41 +  KeReleaseSpinLock(&xi->Lock, OldIrql);
    1.42  
    1.43  //  KdPrint((__DRIVER_NAME " <-- " __FUNCTION__ "\n"));
    1.44  
    1.45 @@ -576,7 +568,6 @@ XenNet_Init(
    1.46    struct xennet_info *xi = NULL;
    1.47    ULONG length;
    1.48    WDF_OBJECT_ATTRIBUTES wdf_attrs;
    1.49 -  char *msg;
    1.50    char *Value;
    1.51    char TmpPath[128];
    1.52  
    1.53 @@ -1186,11 +1177,11 @@ XenNet_SendPackets(
    1.54    int notify;
    1.55    PMDL pmdl;
    1.56    UINT pkt_size;
    1.57 -  PKIRQL OldIrql;
    1.58 +  KIRQL OldIrql;
    1.59  
    1.60  //  KdPrint((__DRIVER_NAME " --> " __FUNCTION__ "\n"));
    1.61  
    1.62 -  KeAcquireSpinLock(xi->Lock, &OldIrql);
    1.63 +  KeAcquireSpinLock(&xi->Lock, &OldIrql);
    1.64  
    1.65    for (i = 0; i < NumberOfPackets; i++)
    1.66    {
    1.67 @@ -1239,7 +1230,7 @@ XenNet_SendPackets(
    1.68        xi->event_channel);
    1.69    }
    1.70  
    1.71 -  KeReleaseSpinLock(xi->Lock, OldIrql);
    1.72 +  KeReleaseSpinLock(&xi->Lock, OldIrql);
    1.73  
    1.74  //  KdPrint((__DRIVER_NAME " <-- " __FUNCTION__ "\n"));
    1.75  }