Merge pull request #1196 from taj0207/main

update with codel fix

Author: taj0207

network/wwan/cxwmbclass/datapipe.cpp

@@ -428,6 +428,7 @@ MbbBusWriteData(__in MBB_BUS_HANDLE BusHandle, __in MBB_REQUEST_HANDLE RequestHa
     WDFMEMORY BufferMemoryObject = NULL;
     WDFREQUEST WriteRequestZLP = NULL;
     PUSB_WRITE_REQ_CONTEXT writeContextZLP = NULL;
+    NTSTATUS ZlpStatus;
 
     usbDeviceContext = GetUsbDeviceContext(BusObject->WdfUsbDevice);
 
@@ -641,7 +642,7 @@ MbbBusWriteData(__in MBB_BUS_HANDLE BusHandle, __in MBB_REQUEST_HANDLE RequestHa
         if (WriteRequestZLP != NULL)
         {
 
-            NTSTATUS ZlpStatus;
+            
 
             Status = WdfUsbTargetPipeFormatRequestForWrite(usbDeviceContext->BulkOutputPipe, WriteRequestZLP, NULL, NULL);
             if (!NT_SUCCESS(Status))
@@ -696,6 +697,7 @@ MbbBusWriteData(__in MBB_BUS_HANDLE BusHandle, __in MBB_REQUEST_HANDLE RequestHa
 
     if (WriteRequestZLP != NULL)
     {
+        Status = ZlpStatus;
         FreeWriteRequest(BusObject->WdfUsbDevice, WriteRequestZLP);
         WriteRequestZLP = NULL;
     }

network/wwan/cxwmbclass/inc/util.h

@@ -2,14 +2,12 @@
 //    Copyright (C) Microsoft.  All rights reserved.
 //
 #pragma once
-typedef enum
-{
-    MbbPoolTagDefault = '0CBM',
-    MbbPoolTagNtbSend = '1CBM',
-    MbbPoolTagNblSend = '2CBM',
-    MbbPoolTagNbSend = '3CBM',
-    MbbPoolTagMdlReceive = '6CBM'
-} MBB_POOL_TAG;
+
+#define MbbPoolTagDefault '0CBM'
+#define MbbPoolTagNtbSend '1CBM'
+#define MbbPoolTagNblSend '2CBM'
+#define MbbPoolTagNbSend '3CBM'
+#define MbbPoolTagMdlReceive '6CBM'
 
 #define ALLOCATE_PAGED_POOL(_y) ExAllocatePool2(POOL_FLAG_PAGED, _y, MbbPoolTagDefault)
 #define ALLOCATE_NONPAGED_POOL(_y) ExAllocatePool2(POOL_FLAG_NON_PAGED, _y, MbbPoolTagDefault)

network/wwan/cxwmbclass/utils.cpp

@@ -248,7 +248,7 @@ MbbBusGetStat(__in MBB_BUS_HANDLE BusHandle, __in USHORT StatIndex, __out ULONGL
 
     if (NT_SUCCESS(Status))
     {
-        if (BytesTransfered < sizeof(Value))
+        if (BytesTransfered < sizeof(*Value))
         {
             Status = STATUS_INFO_LENGTH_MISMATCH;
         }