VNFs: Correcting default traffic_type to IPv4

JIRA: SAMPLEVNF-54

The default traffic_type value needs to be set to IPv4 instead of
MIX type which is not supported.

Change-Id: Ibe8ec31bc7a435fd97aaae0e9e664d0eb70ee30c
Signed-off-by: Anand B Jyoti <anand.b.jyoti@intel.com>

5 files changed, 4 insertions, 6 deletions

diff --git a/VNFs/vACL/pipeline/pipeline_acl_be.c b/VNFs/vACL/pipeline/pipeline_acl_be.c
index 039d6d59..77f1784c 100644
--- a/VNFs/vACL/pipeline/pipeline_acl_be.c
+++ b/VNFs/vACL/pipeline/pipeline_acl_be.c
@@ -3177,7 +3177,7 @@ static void *pipeline_acl_init(struct pipeline_params *params,
 	 *  p_acl->links_map[0] = 0xff;
 	 *  p_acl->links_map[1] = 0xff;]
 	 */
-	p_acl->traffic_type = MIX;
+	p_acl->traffic_type = IPv4_HDR_VERSION;
 	for (i = 0; i < PIPELINE_MAX_PORT_IN; i++) {
 		p_acl->links_map[i] = 0xff;
 		p_acl->port_out_id[i] = 0xff;
diff --git a/VNFs/vACL/pipeline/pipeline_acl_be.h b/VNFs/vACL/pipeline/pipeline_acl_be.h
index 8c85d888..bbb20e82 100644
--- a/VNFs/vACL/pipeline/pipeline_acl_be.h
+++ b/VNFs/vACL/pipeline/pipeline_acl_be.h
@@ -44,7 +44,6 @@ enum pipeline_acl_key_type {
 #define IP_HDR_DST_ADR_OFST 16
 #define IP_VERSION_4 4
 #define IP_VERSION_6 6
-#define MIX 10
 
 /* IPv6 */
 #define IP_HDR_SIZE_IPV6  40
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c
index 2da8b5e4..f9b0eb16 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c
@@ -8450,7 +8450,7 @@ static void *pipeline_cgnapt_init(struct pipeline_params *params, void *arg)
 	p_nat->hw_checksum_reqd = 0;
 	p_nat->pub_ip_port_set = NULL;
 	p_nat->pub_ip_count = 0;
-	p_nat->traffic_type = TRAFFIC_TYPE_MIX;
+	p_nat->traffic_type = TRAFFIC_TYPE_IPV4;
 	p_nat->vnf_set = 0xff;
 
 	/* For every init it should be reset */
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
index 34031192..e5106bfb 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
@@ -325,7 +325,6 @@ f_ah(									\
 #define DST_ADR_OFST_IP4t6 (MBUF_HDR_ROOM + ETH_HDR_SIZE + \
 				IPV6_HDR_DST_ADR_OFST - 20)
 
-#define TRAFFIC_TYPE_MIX   0
 #define TRAFFIC_TYPE_IPV4  4
 #define TRAFFIC_TYPE_IPV6  6
 
diff --git a/VNFs/vFW/pipeline/pipeline_vfw_be.c b/VNFs/vFW/pipeline/pipeline_vfw_be.c
index 97508a77..b659ee58 100644
--- a/VNFs/vFW/pipeline/pipeline_vfw_be.c
+++ b/VNFs/vFW/pipeline/pipeline_vfw_be.c
@@ -142,7 +142,7 @@ struct mbuf_tcp_meta_data {
 
 #define IP_VERSION_4 4
 #define IP_VERSION_6 6
-#define MIX 10
+
 /* IPv6 */
 #define IP_HDR_SIZE_IPV6  40
 #define IP_HDR_DSCP_OFST_IPV6 0
@@ -2555,7 +2555,7 @@ static void
        strncpy(pipe->name, params->name, sizeof(pipe->name));
        pipe->log_level = params->log_level;
        pipe_vfw->n_flows = 4096;       /* small default value */
-       pipe_vfw->traffic_type = MIX;
+       pipe_vfw->traffic_type = IP_VERSION_4;
        pipe_vfw->pipeline_num = 0xff;
        for (i = 0; i < PIPELINE_MAX_PORT_IN; i++) {
               pipe_vfw->links_map[i] = 0xff;