linux-gen: dpdk: prefix visible internal parse functions with _odp_

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

3 files changed, 34 insertions, 29 deletions

diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h
index d457cfa30..0dac296ac 100644
--- a/platform/linux-generic/include/odp_packet_dpdk.h
+++ b/platform/linux-generic/include/odp_packet_dpdk.h
@@ -13,23 +13,24 @@ struct rte_mbuf;
 
 /** Cache for storing packets */
 /** Packet parser using DPDK interface */
-int dpdk_packet_parse_common(packet_parser_t *pkt_hdr,
-			     const uint8_t *ptr,
-			     uint32_t pkt_len,
-			     uint32_t seg_len,
-			     struct rte_mbuf *mbuf,
-			     int layer,
-			     odp_pktin_config_opt_t pktin_cfg);
+int _odp_dpdk_packet_parse_common(packet_parser_t *pkt_hdr,
+				  const uint8_t *ptr,
+				  uint32_t pkt_len,
+				  uint32_t seg_len,
+				  struct rte_mbuf *mbuf,
+				  int layer,
+				  odp_pktin_config_opt_t pktin_cfg);
 
-static inline int dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr,
-					  struct rte_mbuf *mbuf,
-					  odp_pktio_parser_layer_t layer,
-					  odp_pktin_config_opt_t pktin_cfg)
+static inline int _odp_dpdk_packet_parse_layer(odp_packet_hdr_t *pkt_hdr,
+					       struct rte_mbuf *mbuf,
+					       odp_pktio_parser_layer_t layer,
+					       odp_pktin_config_opt_t pktin_cfg)
 {
 	uint32_t seg_len = pkt_hdr->buf_hdr.seg[0].len;
 	void *base = pkt_hdr->buf_hdr.seg[0].data;
 
-	return dpdk_packet_parse_common(&pkt_hdr->p, base, pkt_hdr->frame_len,
-					seg_len, mbuf, layer, pktin_cfg);
+	return _odp_dpdk_packet_parse_common(&pkt_hdr->p, base,
+					     pkt_hdr->frame_len, seg_len, mbuf,
+					     layer, pktin_cfg);
 }
 #endif
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 3e34b2477..34c234403 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -530,10 +530,11 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
 		if (pktio_cls_enabled(pktio_entry)) {
 			packet_parse_reset(&parsed_hdr);
 			packet_set_len(&parsed_hdr, pkt_len);
-			if (dpdk_packet_parse_common(&parsed_hdr.p, data,
-						     pkt_len, pkt_len, mbuf,
-						     ODP_PROTO_LAYER_ALL,
-						     pktin_cfg)) {
+			if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data,
+							  pkt_len, pkt_len,
+							  mbuf,
+							  ODP_PROTO_LAYER_ALL,
+							  pktin_cfg)) {
 				odp_packet_free(pkt_table[i]);
 				rte_pktmbuf_free(mbuf);
 				continue;
@@ -557,8 +558,9 @@ static inline int mbuf_to_pkt(pktio_entry_t *pktio_entry,
 		if (pktio_cls_enabled(pktio_entry))
 			copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
 		else if (parse_layer != ODP_PROTO_LAYER_NONE)
-			if (dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer,
-						    pktin_cfg)) {
+			if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf,
+							 parse_layer,
+							 pktin_cfg)) {
 				odp_packet_free(pkt);
 				rte_pktmbuf_free(mbuf);
 				continue;
@@ -803,10 +805,11 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
 		if (pktio_cls_enabled(pktio_entry)) {
 			packet_parse_reset(&parsed_hdr);
 			packet_set_len(&parsed_hdr, pkt_len);
-			if (dpdk_packet_parse_common(&parsed_hdr.p, data,
-						     pkt_len, pkt_len, mbuf,
-						     ODP_PROTO_LAYER_ALL,
-						     pktin_cfg)) {
+			if (_odp_dpdk_packet_parse_common(&parsed_hdr.p, data,
+							  pkt_len, pkt_len,
+							  mbuf,
+							  ODP_PROTO_LAYER_ALL,
+							  pktin_cfg)) {
 				rte_pktmbuf_free(mbuf);
 				continue;
 			}
@@ -830,8 +833,9 @@ static inline int mbuf_to_pkt_zero(pktio_entry_t *pktio_entry,
 		if (pktio_cls_enabled(pktio_entry))
 			copy_packet_cls_metadata(&parsed_hdr, pkt_hdr);
 		else if (parse_layer != ODP_PROTO_LAYER_NONE)
-			if (dpdk_packet_parse_layer(pkt_hdr, mbuf, parse_layer,
-						    pktin_cfg)) {
+			if (_odp_dpdk_packet_parse_layer(pkt_hdr, mbuf,
+							 parse_layer,
+							 pktin_cfg)) {
 				rte_pktmbuf_free(mbuf);
 				continue;
 			}
diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c
index e9de0756a..5f2b31d08 100644
--- a/platform/linux-generic/pktio/dpdk_parse.c
+++ b/platform/linux-generic/pktio/dpdk_parse.c
@@ -457,10 +457,10 @@ int dpdk_packet_parse_common_l3_l4(packet_parser_t *prs,
 /**
  * DPDK packet parser
  */
-int dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
-			     uint32_t frame_len, uint32_t seg_len,
-			     struct rte_mbuf *mbuf, int layer,
-			     odp_pktin_config_opt_t pktin_cfg)
+int _odp_dpdk_packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
+				  uint32_t frame_len, uint32_t seg_len,
+				  struct rte_mbuf *mbuf, int layer,
+				  odp_pktin_config_opt_t pktin_cfg)
 {
 	uint32_t offset;
 	uint16_t ethtype;