From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Aug 2019 18:07:20 +0000 (-0700)
Subject: Common header file change not directly applicable to open-vm-tools.
X-Git-Tag: stable-11.1.0~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56d81d3ee5d1c6b13b43461713e78fb2ad3958c7;p=thirdparty%2Fopen-vm-tools.git

Common header file change not directly 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 13db0cb2d..e1ecf9632 100644
--- a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
+++ b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h
@@ -291,6 +291,9 @@ Vmxnet3_RxDesc;
 #define VMXNET3_RXD_BTYPE_SHIFT  14
 #define VMXNET3_RXD_GEN_SHIFT    31
 
+#define VMXNET3_RCD_HDR_INNER_SHIFT  13
+#define VMXNET3_RCD_RSS_INNER_SHIFT  12
+
 typedef
 #include "vmware_pack_begin.h"
 struct Vmxnet3_RxCompDesc {
@@ -301,13 +304,13 @@ struct Vmxnet3_RxCompDesc {
    uint32 rqID:10;      /* rx queue/ring ID */
    uint32 sop:1;        /* Start of Packet */
    uint32 eop:1;        /* End of Packet */
-   uint32 isInnerHdr:1; /* indicating v4/v6/.. is for inner header */
-   uint32 isInnerRss:1; /* indicating rssType is based on inner header */
+   uint32 ext1:2;       /* bit 0: indicating v4/v6/.. is for inner header */
+                        /* bit 1: indicating rssType is based on inner header */
    uint32 rxdIdx:12;    /* Index of the RxDesc */
 #else
    uint32 rxdIdx:12;    /* Index of the RxDesc */
-   uint32 isInnerRss:1; /* indicating rssType is based on inner header */
-   uint32 isInnerHdr:1; /* indicating v4/v6/.. is for inner header */
+   uint32 ext1:2;       /* bit 0: indicating v4/v6/.. is for inner header */
+                        /* bit 1: indicating rssType is based on inner header */
    uint32 eop:1;        /* End of Packet */
    uint32 sop:1;        /* Start of Packet */
    uint32 rqID:10;      /* rx queue/ring ID */