From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id AC88EA05D3
for <public@inbox.dpdk.org>; Tue, 21 May 2019 18:14:32 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0582A5F20;
Tue, 21 May 2019 18:13:44 +0200 (CEST)
Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com
[62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 3E89C4C96
for <dev@dpdk.org>; Tue, 21 May 2019 18:13:25 +0200 (CEST)
Received: from glumotte.dev.6wind.com. (unknown [10.16.0.195])
by proxy.6wind.com (Postfix) with ESMTP id 215102B83DA;
Tue, 21 May 2019 18:13:25 +0200 (CEST)
From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: stephen@networkplumber.org,
ferruh.yigit@intel.com
Date: Tue, 21 May 2019 18:13:07 +0200
Message-Id: <20190521161315.25500-8-olivier.matz@6wind.com>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <20190521161315.25500-1-olivier.matz@6wind.com>
References: <20190410083218.17531-1-olivier.matz@6wind.com>
<20190521161315.25500-1-olivier.matz@6wind.com>
Subject: [dpdk-dev] [PATCH 07/15] net: add rte prefix to gre structure
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Add 'rte_' prefix to structures:
- rename struct gre_hdr as struct rte_gre_hdr.
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 4 ++--
lib/librte_net/rte_gre.h | 2 +-
lib/librte_net/rte_net.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 6a706fdfe..b7a56ebdc 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1218,7 +1218,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
struct udp_hdr *udp = NULL;
struct rte_vxlan_hdr *vxlan = NULL;
struct rte_vxlan_gpe_hdr *vxlan_gpe = NULL;
- struct gre_hdr *gre = NULL;
+ struct rte_gre_hdr *gre = NULL;
size_t len;
size_t temp_size = 0;
@@ -1331,7 +1331,7 @@ flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,
break;
case RTE_FLOW_ITEM_TYPE_GRE:
case RTE_FLOW_ITEM_TYPE_NVGRE:
- gre = (struct gre_hdr *)&buf[temp_size];
+ gre = (struct rte_gre_hdr *)&buf[temp_size];
if (!gre->proto)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION,
diff --git a/lib/librte_net/rte_gre.h b/lib/librte_net/rte_gre.h
index 05aa9d143..b5279ede1 100644
--- a/lib/librte_net/rte_gre.h
+++ b/lib/librte_net/rte_gre.h
@@ -16,7 +16,7 @@ extern "C" {
* GRE Header
*/
__extension__
-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 5551cce17..d858ab155 100644
--- a/lib/librte_net/rte_net.c
+++ b/lib/librte_net/rte_net.c
@@ -140,8 +140,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.11.0