From: Anand B Jyoti <anand.b.jyoti@intel.com>
Date: Thu, 12 Oct 2017 01:34:03 +0000 (+0530)
Subject: vACL: The ethernet mac address not updated correctly
X-Git-Tag: opnfv-5.0.RC1~15
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F44917%2F1;p=samplevnf.git

vACL: The ethernet mac address not updated correctly

JIRA: SAMPLEVNF-85

The ethernet header pointer initialization was wrong due to which
the MAC address were not updated. Hence the packets were not
reaching the destination.

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

diff --git a/VNFs/vACL/pipeline/pipeline_acl_be.c b/VNFs/vACL/pipeline/pipeline_acl_be.c
index 512c2f64..d4b92109 100644
--- a/VNFs/vACL/pipeline/pipeline_acl_be.c
+++ b/VNFs/vACL/pipeline/pipeline_acl_be.c
@@ -784,7 +784,7 @@ pkt_work_acl_key(struct rte_pipeline *p,
                 /* Gateway Proc Starts */
                 struct ether_hdr *ehdr = (struct ether_hdr *)
                     RTE_MBUF_METADATA_UINT32_PTR(pkt,
-                            META_DATA_OFFSET + MBUF_HDR_ROOM);
+                            META_DATA_OFFSET + RTE_PKTMBUF_HEADROOM);
 
                 struct ipv4_hdr *ipv4hdr = (struct ipv4_hdr *)
                     RTE_MBUF_METADATA_UINT32_PTR(pkt, IP_START);
@@ -896,7 +896,7 @@ pkt_work_acl_key(struct rte_pipeline *p,
 
                 struct ether_hdr *ehdr = (struct ether_hdr *)
                     RTE_MBUF_METADATA_UINT32_PTR(pkt,
-                            META_DATA_OFFSET + MBUF_HDR_ROOM);
+                            META_DATA_OFFSET + RTE_PKTMBUF_HEADROOM);
 
                 struct ether_addr dst_mac;
                 uint8_t nhipv6[IPV6_ADD_SIZE];
@@ -1481,7 +1481,7 @@ pkt_work_acl_ipv4_key(struct rte_pipeline *p,
                 /* Gateway Proc Starts */
                 struct ether_hdr *ehdr = (struct ether_hdr *)
                     RTE_MBUF_METADATA_UINT32_PTR(pkt,
-                            META_DATA_OFFSET + MBUF_HDR_ROOM);
+                            META_DATA_OFFSET + RTE_PKTMBUF_HEADROOM);
 
                 struct ipv4_hdr *ipv4hdr = (struct ipv4_hdr *)
                     RTE_MBUF_METADATA_UINT32_PTR(pkt, IP_START);
@@ -2065,7 +2065,7 @@ pkt_work_acl_ipv6_key(struct rte_pipeline *p,
 
                 struct ether_hdr *ehdr = (struct ether_hdr *)
                     RTE_MBUF_METADATA_UINT32_PTR(pkt,
-                            META_DATA_OFFSET + MBUF_HDR_ROOM);
+                            META_DATA_OFFSET + RTE_PKTMBUF_HEADROOM);
 
                 struct ether_addr dst_mac;
                 uint32_t dest_if = INVALID_DESTIF;