From 0b3a185e2bca26996682dc569cdbf64a9d94817c Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 23 Oct 2018 18:24:58 +0200 Subject: [PATCH] net: add rte prefix to gre structure - rename struct gre_hdr as struct rte_gre_hdr Signed-off-by: Olivier Matz --- lib/librte_net/rte_gre.h | 2 +- lib/librte_net/rte_net.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_net/rte_gre.h b/lib/librte_net/rte_gre.h index 69499bb82a..0a09543ea1 100644 --- a/lib/librte_net/rte_gre.h +++ b/lib/librte_net/rte_gre.h @@ -15,7 +15,7 @@ extern "C" { /** * GRE Header */ -struct gre_hdr { +struct rte_gre_hdr { #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN uint16_t res2:4; /**< Reserved */ uint16_t s:1; /**< Sequence Number Present bit */ diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index d7d94791f4..3ad16f0c4b 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.c @@ -139,8 +139,8 @@ ptype_tunnel(uint16_t *proto, const struct rte_mbuf *m, [0xa] = 12, [0xb] = 16, }; - const struct gre_hdr *gh; - struct gre_hdr gh_copy; + const struct rte_gre_hdr *gh; + struct rte_gre_hdr gh_copy; uint16_t flags; gh = rte_pktmbuf_read(m, *off, sizeof(*gh), &gh_copy); -- 2.20.1