Merge changes from PROX-v041

[samplevnf.git] / VNFs / vCGNAPT / pipeline / pipeline_cgnapt_be.h

diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.h
index 94f19f1..7fde0c5 100644 (file)
--- 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
 
@@ -419,14 +418,6 @@ struct pipeline_cgnapt {
 
        uint8_t vnf_set;        /* to identify as separate LB-CGNAPT set */
 
-       /* Local ARP & ND Tables */
-       struct lib_arp_route_table_entry
-               local_lib_arp_route_table[MAX_ARP_RT_ENTRY];
-       uint8_t local_lib_arp_route_ent_cnt;
-       struct lib_nd_route_table_entry
-               local_lib_nd_route_table[MAX_ND_RT_ENTRY];
-       uint8_t local_lib_nd_route_ent_cnt;
-
        /* For internal debugging purpose */
 #ifdef CGNAPT_TIMING_INST
        uint64_t in_port_exit_timestamp;
@@ -756,11 +747,6 @@ int pipeline_cgnapt_msg_req_entry_addm_pair(
        uint8_t type, uint8_t src_ipv6[16]);
 
 /* CGNAPT Functions */
-extern void rte_pipeline_action_handler_port_ext(
-       struct rte_pipeline *p,
-       uint64_t pkts_mask,
-       struct rte_pipeline_table_entry **entries);
-
 uint64_t pkt_miss_cgnapt(
        struct pipeline_cgnapt_entry_key *key,
        struct rte_mbuf *pkt,
@@ -785,7 +771,6 @@ void calculate_hw_checksum(
        uint8_t protocol);
 
 uint64_t nextPowerOf2(uint64_t n);
-struct ether_addr *get_local_link_hw_addr(uint8_t out_port);
 uint8_t local_dest_mac_present(uint8_t out_port);
 
 enum PKT_TYPE {