[RFC,v2,08/14] net: add rte prefix to icmp structure

Message ID 20190410083218.17531-9-olivier.matz@6wind.com
State Superseded
Delegated to: Ferruh Yigit
Headers show
Series
  • prefix network structures
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Olivier Matz April 10, 2019, 8:32 a.m.
Add 'rte_' prefix to structures:
- rename struct icmp_hdr as struct rte_icmp_hdr.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 app/test-pmd/icmpecho.c      | 4 ++--
 lib/librte_ethdev/rte_flow.h | 2 +-
 lib/librte_net/rte_icmp.h    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index e778de438..33b9e2ffd 100644
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -279,7 +279,7 @@  reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 	struct rte_vlan_hdr *vlan_h;
 	struct rte_arp_hdr  *arp_h;
 	struct ipv4_hdr *ip_h;
-	struct icmp_hdr *icmp_h;
+	struct rte_icmp_hdr *icmp_h;
 	struct rte_ether_addr eth_addr;
 	uint32_t retry;
 	uint32_t ip_addr;
@@ -425,7 +425,7 @@  reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 		/*
 		 * Check if packet is a ICMP echo request.
 		 */
-		icmp_h = (struct icmp_hdr *) ((char *)ip_h +
+		icmp_h = (struct rte_icmp_hdr *) ((char *)ip_h +
 					      sizeof(struct ipv4_hdr));
 		if (! ((ip_h->next_proto_id == IPPROTO_ICMP) &&
 		       (icmp_h->icmp_type == IP_ICMP_ECHO_REQUEST) &&
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 58ac9f4d7..56f129bd3 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -674,7 +674,7 @@  static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
  * Matches an ICMP header.
  */
 struct rte_flow_item_icmp {
-	struct icmp_hdr hdr; /**< ICMP header definition. */
+	struct rte_icmp_hdr hdr; /**< ICMP header definition. */
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_ICMP. */
diff --git a/lib/librte_net/rte_icmp.h b/lib/librte_net/rte_icmp.h
index 053b5f6a4..d0309537e 100644
--- a/lib/librte_net/rte_icmp.h
+++ b/lib/librte_net/rte_icmp.h
@@ -23,7 +23,7 @@  extern "C" {
 /**
  * ICMP Header
  */
-struct icmp_hdr {
+struct rte_icmp_hdr {
 	uint8_t  icmp_type;   /* ICMP packet type. */
 	uint8_t  icmp_code;   /* ICMP packet code. */
 	uint16_t icmp_cksum;  /* ICMP packet checksum. */