net/ice/base: fix NVGRE header structure

Correct NVGRE header structure and its field offsets.

Fixes: 04b8ec1ea807 ("net/ice/base: add protocol structures and defines")
Cc: stable@dpdk.org
Signed-off-by: Dan Nowlin <dan.nowlin@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Leyi Rong <leyi.rong@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h
index 38bed7a792f6b0d3fb42c6dfe0abd6ec6f57b4bb..033efdb5a0fb75f87764017a6a4c16474df6c639 100644 (file)
--- 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 72bb5b50d71c30199d23298ca6d8478d6e021e40..7455ac4481d4bbc6e6c40c5f5ae581a3a171e862 100644 (file)
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -4390,7 +4390,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 } }
 };