[PATCH 0/1] MR1028: nsi: Use the correct members for the error and discard counts.

[Huw Davies (＠huw)]

This is instead of !984.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1028

[PATCH 1/1] nsi: Use the correct members for the error and discard counts.

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53234
---
 include/wine/nsi.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/wine/nsi.h b/include/wine/nsi.h
index 42fc4f68a67..0e20490e2a8 100644
--- a/include/wine/nsi.h
+++ b/include/wine/nsi.h
@@ -54,11 +54,9 @@ struct nsi_ndis_ifinfo_dynamic
     UINT mtu;
     ULONG64 xmit_speed;
     ULONG64 rcv_speed;
-    ULONG64 in_errors;
+    ULONG64 unk2[3];
     ULONG64 in_discards;
-    ULONG64 out_errors;
-    ULONG64 out_discards;
-    ULONG64 unk2;
+    ULONG64 in_errors;
     ULONG64 in_octets;
     ULONG64 in_ucast_pkts;
     ULONG64 in_mcast_pkts;
@@ -67,7 +65,8 @@ struct nsi_ndis_ifinfo_dynamic
     ULONG64 out_ucast_pkts;
     ULONG64 out_mcast_pkts;
     ULONG64 out_bcast_pkts;
-    ULONG64 unk3[2];
+    ULONG64 out_errors;
+    ULONG64 out_discards;
     ULONG64 in_ucast_octs;
     ULONG64 in_mcast_octs;
     ULONG64 in_bcast_octs;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1028

[PATCH 1/1] nsi: Use the correct members for the error and discard counts.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=124869

Your paranoid android.


=== debian11 (build log) ===

Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24673.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24673.
Use of uninitialized value $Flaky in addition (+) at /home/testbot/lib/WineTestBot/LogUtils.pm line 720, <$LogFile> line 24673.