[1/2] linux-dpdk: sync internal config definition naming with linux-generic

Message ID 1490855398-12834-1-git-send-email-matias.elo@nokia.com
State New
Headers show
Series
  • [1/2] linux-dpdk: sync internal config definition naming with linux-generic
Related show

Commit Message

Matias Elo March 30, 2017, 6:29 a.m.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
---
 platform/linux-dpdk/include/odp_buffer_internal.h |  2 +-
 platform/linux-dpdk/include/odp_config_internal.h | 16 ++++++++--------
 platform/linux-dpdk/include/odp_packet_internal.h |  2 +-
 platform/linux-dpdk/odp_pool.c                    | 20 ++++++++++----------
 4 files changed, 20 insertions(+), 20 deletions(-)

Patch hide | download patch | download mbox

diff --git a/platform/linux-dpdk/include/odp_buffer_internal.h b/platform/linux-dpdk/include/odp_buffer_internal.h
index 72fce68..451a628 100644
--- a/platform/linux-dpdk/include/odp_buffer_internal.h
+++ b/platform/linux-dpdk/include/odp_buffer_internal.h
@@ -37,7 +37,7 @@  extern "C" {
 /* DPDK */
 #include <rte_mbuf.h>
 
-ODP_STATIC_ASSERT(ODP_CONFIG_PACKET_SEG_LEN_MIN >= 256,
+ODP_STATIC_ASSERT(CONFIG_PACKET_SEG_LEN_MIN >= 256,
 		  "ODP Segment size must be a minimum of 256 bytes");
 
 typedef union odp_buffer_bits_t {
diff --git a/platform/linux-dpdk/include/odp_config_internal.h b/platform/linux-dpdk/include/odp_config_internal.h
index 68e06fd..0248da2 100644
--- a/platform/linux-dpdk/include/odp_config_internal.h
+++ b/platform/linux-dpdk/include/odp_config_internal.h
@@ -59,7 +59,7 @@  extern "C" {
  * The default value (66) allows a 1500-byte packet to be received into a single
  * segment with Ethernet offset alignment and room for some header expansion.
  */
-#define ODP_CONFIG_PACKET_HEADROOM 128
+#define CONFIG_PACKET_HEADROOM 128
 
 /*
  * Default packet tailroom
@@ -70,12 +70,12 @@  extern "C" {
  * without restriction. Note that most implementations will automatically
  * consider any unused portion of the last segment of a packet as tailroom
  */
-#define ODP_CONFIG_PACKET_TAILROOM 0
+#define CONFIG_PACKET_TAILROOM 0
 
 /*
  * Maximum number of segments per packet
  */
-#define ODP_CONFIG_PACKET_MAX_SEGS 60
+#define CONFIG_PACKET_MAX_SEGS 60
 
 /*
  * Minimum packet segment length
@@ -84,7 +84,7 @@  extern "C" {
  * defined segment length (seg_len in odp_pool_param_t) will be rounded up into
  * this value.
  */
-#define ODP_CONFIG_PACKET_SEG_LEN_MIN 1024
+#define CONFIG_PACKET_SEG_LEN_MIN 1024
 
 /*
  * Maximum packet segment length
@@ -93,10 +93,10 @@  extern "C" {
  * defined segment length (seg_len in odp_pool_param_t) must not be larger than
  * this.
  */
-#define ODP_CONFIG_PACKET_SEG_LEN_MAX (ODP_CONFIG_PACKET_MAX_SEGS * \
-				       (ODP_CONFIG_PACKET_SEG_LEN_MIN - \
-					ODP_CONFIG_PACKET_HEADROOM - \
-					ODP_CONFIG_PACKET_TAILROOM))
+#define CONFIG_PACKET_SEG_LEN_MAX (CONFIG_PACKET_MAX_SEGS * \
+				   (CONFIG_PACKET_SEG_LEN_MIN - \
+				    CONFIG_PACKET_HEADROOM - \
+				    CONFIG_PACKET_TAILROOM))
 
 /* Maximum number of shared memory blocks.
  *
diff --git a/platform/linux-dpdk/include/odp_packet_internal.h b/platform/linux-dpdk/include/odp_packet_internal.h
index aa2e39c..47342bb 100644
--- a/platform/linux-dpdk/include/odp_packet_internal.h
+++ b/platform/linux-dpdk/include/odp_packet_internal.h
@@ -295,7 +295,7 @@  int packet_parse_common(packet_parser_t *pkt_hdr, const uint8_t *ptr,
 			uint32_t pkt_len, uint32_t seg_len, layer_t layer);
 
 /* We can't enforce tailroom reservation for received packets */
-ODP_STATIC_ASSERT(ODP_CONFIG_PACKET_TAILROOM == 0,
+ODP_STATIC_ASSERT(CONFIG_PACKET_TAILROOM == 0,
 		  "ERROR: Tailroom has to be 0, DPDK doesn't support this");
 
 #ifdef __cplusplus
diff --git a/platform/linux-dpdk/odp_pool.c b/platform/linux-dpdk/odp_pool.c
index cf7b1db..45488d0 100644
--- a/platform/linux-dpdk/odp_pool.c
+++ b/platform/linux-dpdk/odp_pool.c
@@ -120,13 +120,13 @@  int odp_pool_capability(odp_pool_capability_t *capa)
 
 	/* Packet pools */
 	capa->pkt.max_pools        = ODP_CONFIG_POOLS;
-	capa->pkt.max_len          = ODP_CONFIG_PACKET_SEG_LEN_MAX;
+	capa->pkt.max_len          = CONFIG_PACKET_SEG_LEN_MAX;
 	capa->pkt.max_num	   = CONFIG_POOL_MAX_NUM;
-	capa->pkt.min_headroom     = ODP_CONFIG_PACKET_HEADROOM;
-	capa->pkt.min_tailroom     = ODP_CONFIG_PACKET_TAILROOM;
-	capa->pkt.max_segs_per_pkt = ODP_CONFIG_PACKET_MAX_SEGS;
-	capa->pkt.min_seg_len      = ODP_CONFIG_PACKET_SEG_LEN_MIN;
-	capa->pkt.max_seg_len      = ODP_CONFIG_PACKET_SEG_LEN_MAX;
+	capa->pkt.min_headroom     = CONFIG_PACKET_HEADROOM;
+	capa->pkt.min_tailroom     = CONFIG_PACKET_TAILROOM;
+	capa->pkt.max_segs_per_pkt = CONFIG_PACKET_MAX_SEGS;
+	capa->pkt.min_seg_len      = CONFIG_PACKET_SEG_LEN_MIN;
+	capa->pkt.max_seg_len      = CONFIG_PACKET_SEG_LEN_MAX;
 	capa->pkt.max_uarea_size   = MAX_SIZE;
 
 	/* Timeout pools */
@@ -367,9 +367,9 @@  odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params)
 				params->buf.size, params->buf.align);
 			break;
 		case ODP_POOL_PACKET:
-			headroom = ODP_CONFIG_PACKET_HEADROOM;
-			tailroom = ODP_CONFIG_PACKET_TAILROOM;
-			min_seg_len = ODP_CONFIG_PACKET_SEG_LEN_MIN;
+			headroom = CONFIG_PACKET_HEADROOM;
+			tailroom = CONFIG_PACKET_TAILROOM;
+			min_seg_len = CONFIG_PACKET_SEG_LEN_MIN;
 			min_align = ODP_CONFIG_BUFFER_ALIGN_MIN;
 
 			blk_size = min_seg_len;
@@ -380,7 +380,7 @@  odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params)
 			/* Make sure at least one max len packet fits in the
 			 * pool.
 			 */
-			max_len = ODP_CONFIG_PACKET_SEG_LEN_MAX;
+			max_len = CONFIG_PACKET_SEG_LEN_MAX;
 			if (params->pkt.max_len != 0)
 				max_len = params->pkt.max_len;
 			if ((max_len + blk_size) / blk_size > params->pkt.num)