[win-pv-devel] [PATCH] Fix a warning in the NDISTest 6.0 2c_OidsNdisRequest test

[Paul Durrant <pdurrant@xxxxxxxxx>]

The format of the response to the OID_GEN_VENDOR_DRIVER_VERSION request was
incorrect, and also the OID_GEN_DRIVER_VERSION response has been lying since
the change to NDIS 6.1.

Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
 src/xennet/adapter.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xennet/adapter.c b/src/xennet/adapter.c
index 0f83c9e..4e2f7fa 100644
--- a/src/xennet/adapter.c
+++ b/src/xennet/adapter.c
@@ -1889,7 +1889,8 @@ AdapterQueryInformation(
         BytesNeeded = sizeof(ULONG);
         ndisStatus = __SetUlong(Buffer,
                                 BufferLength,
-                                ((MAJOR_VERSION << 8) | MINOR_VERSION) << 8,
+                                (MAJOR_VERSION << 16) |
+                                MINOR_VERSION,
                                 &BytesWritten);
         break;
 
@@ -1897,7 +1898,8 @@ AdapterQueryInformation(
         BytesNeeded = sizeof(ULONG);
         ndisStatus = __SetUlong(Buffer,
                                 BufferLength,
-                                (6 << 8) | 0, // NDIS 6.0
+                                (NDIS_MINIPORT_MAJOR_VERSION << 8) |
+                                NDIS_MINIPORT_MINOR_VERSION,
                                 &BytesWritten);
         break;
 
-- 
2.1.1


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel