[dpdk-dev] [PATCH v3 62/69] net/ice/base: correct NVGRE header structure

[Leyi Rong]

Correct NVGRE header structure and its field offsets.

Signed-off-by: Dan Nowlin <dan.now...@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell...@intel.com>
Signed-off-by: Leyi Rong <leyi.r...@intel.com>
---
 drivers/net/ice/base/ice_protocol_type.h | 5 +++--
 drivers/net/ice/base/ice_switch.c        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ice/base/ice_protocol_type.h 
b/drivers/net/ice/base/ice_protocol_type.h
index 38bed7a79..033efdb5a 100644
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -194,8 +194,9 @@ struct ice_udp_tnl_hdr {
 };
 
 struct ice_nvgre {
-       u16 tni;
-       u16 flow_id;
+       u16 flags;
+       u16 protocol;
+       u32 tni_flow;
 };
 
 union ice_prot_hdr {
diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index fe4d344a4..636b43d69 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4310,7 +4310,7 @@ static const struct ice_prot_ext_tbl_entry ice_prot_ext[] 
= {
        { ICE_VXLAN,            { 8, 10, 12, 14 } },
        { ICE_GENEVE,           { 8, 10, 12, 14 } },
        { ICE_VXLAN_GPE,        { 0, 2, 4 } },
-       { ICE_NVGRE,            { 0, 2 } },
+       { ICE_NVGRE,            { 0, 2, 4, 6 } },
        { ICE_PROTOCOL_LAST,    { 0 } }
 };
 
-- 
2.17.1