From 8d0fa8c7f552270c86d05268c19bbc2ffe78a04a Mon Sep 17 00:00:00 2001 From: Leyi Rong Date: Wed, 19 Jun 2019 23:18:39 +0800 Subject: [PATCH] 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 Signed-off-by: Paul M Stillwell Jr Signed-off-by: Leyi Rong Acked-by: Qi Zhang --- 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 38bed7a792..033efdb5a0 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 72bb5b50d7..7455ac4481 100644 --- 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 } } }; -- 2.20.1