From: Kruti <kpendharkar@vmware.com>
Date: Mon, 18 Mar 2024 18:03:48 +0000 (-0700)
Subject: Change to common header file not applicable to open-vm-tools.
X-Git-Tag: stable-12.5.0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=652a17c1d06a0ced2fceecde700ad93623d311b6;p=thirdparty%2Fopen-vm-tools.git

Change to common header file not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
index b61766e4e..ab072b9aa 100644
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
@@ -646,8 +646,7 @@ typedef struct Vmxnet3_RxQueueConf {
 #pragma pack(push, 1)
 typedef struct Vmxnet3_LatencyConf {
    uint16 sampleRate;
-   uint16 packetSize;
-   uint32 pad;
+   uint16 pad;
 } Vmxnet3_LatencyConf;
 #pragma pack(pop)
 
@@ -655,7 +654,7 @@ typedef struct Vmxnet3_LatencyConf {
 typedef struct Vmxnet3_TxQueueTSConf {
    __le64    txTSRingBasePA;
    __le16    txTSRingDescSize; /* size of tx timestamp ring buffer */
-   uint16    pad[3];
+   uint16    pad;
    Vmxnet3_LatencyConf latencyConf;
 } Vmxnet3_TxQueueTSConf;
 #pragma pack(pop)
@@ -664,7 +663,7 @@ typedef struct Vmxnet3_TxQueueTSConf {
 typedef struct Vmxnet3_RxQueueTSConf {
    __le64    rxTSRingBasePA;
    __le16    rxTSRingDescSize; /* size of rx timestamp ring buffer */
-   uint16    pad[7];
+   uint16    pad[3];
 } Vmxnet3_RxQueueTSConf;
 #pragma pack(pop)
 
@@ -986,7 +985,7 @@ typedef struct Vmxnet3_TxQueueDesc {
    Vmxnet3_QueueStatus status;
    UPT1_TxStats        stats;
    Vmxnet3_TxQueueTSConf tsConf;
-   uint8               _pad[64]; /* 128 aligned */
+   uint8               _pad[72]; /* 128 aligned */
 } Vmxnet3_TxQueueDesc;
 #pragma pack(pop)
 
@@ -998,7 +997,7 @@ typedef struct Vmxnet3_RxQueueDesc {
    Vmxnet3_QueueStatus status;
    UPT1_RxStats        stats;
    Vmxnet3_RxQueueTSConf tsConf;
-   uint8               _pad[64]; /* 128 aligned */
+   uint8               _pad[72]; /* 128 aligned */
 } Vmxnet3_RxQueueDesc;
 #pragma pack(pop)