Report NDIS minor version as expected by OS

WHQL requires NDIS minor versions to match the OS under test.
For Server 2022, this requires NDIS version 6.85 and Server 2025 requires
NDIS version 6.89.
In order to build with EWDK 22000, the reported version is echoed from the
call to NdisGetVersion() without requiring updated headers.

Note: NDIS 6.89 does add support for UDP Receive Segment Coalescing Offload
(URO), but XenNet does not support this new NDIS feature.

Signed-off-by: Owen Smith <owen.smith@cloud.com>

diff --git a/src/xennet/miniport.c b/src/xennet/miniport.c
index 5dc98583ac93c029cb44b3c9472410d771d2aca5..250b090912f4f5e4e79ca783742aa66260b20329 100644 (file)
--- a/src/xennet/miniport.c
+++ b/src/xennet/miniport.c
@@ -348,16 +348,16 @@ MiniportRegister(
         MiniportDriverCharacteristics.Header.Size = NDIS_SIZEOF_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3;
         MiniportDriverCharacteristics.Header.Revision = NDIS_MINIPORT_DRIVER_CHARACTERISTICS_REVISION_3;
 
-        MiniportDriverCharacteristics.MajorNdisVersion = NDIS_MINIPORT_MAJOR_VERSION; // 6
-        MiniportDriverCharacteristics.MinorNdisVersion = NDIS_MINIPORT_MINOR_VERSION; // 85
+        MiniportDriverCharacteristics.MajorNdisVersion = (UCHAR)(NdisGetVersion() >> 16);
+        MiniportDriverCharacteristics.MinorNdisVersion = (UCHAR)(NdisGetVersion() & 0x00FF);
     } else
 #endif
     if (NdisGetVersion() >= NDIS_RUNTIME_VERSION_660) {
         MiniportDriverCharacteristics.MajorNdisVersion = 6;
         MiniportDriverCharacteristics.MinorNdisVersion = 60;
     } else {
-        MiniportDriverCharacteristics.MajorNdisVersion = NDIS_MINIPORT_MINIMUM_MAJOR_VERSION; // 6
-        MiniportDriverCharacteristics.MinorNdisVersion = NDIS_MINIPORT_MINIMUM_MINOR_VERSION; // 30
+        MiniportDriverCharacteristics.MajorNdisVersion = 6;
+        MiniportDriverCharacteristics.MinorNdisVersion = 30;
     }
 
     MiniportDriverCharacteristics.MajorDriverVersion = MAJOR_VERSION;