diff options
| author |   Deepak S <deepak.s@linux.intel.com> | 2017-07-20 11:22:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-20 11:22:33 +0000 |
| commit | d923180e4af2612361dd7d4bf1627092a4d552d8 (patch) | |
| tree | 6809880ce8c96365778514f3c820f08588910ae5 /common/vnf_common | |
| parent | 51759157a499326cfe69ec0eecb00b1c5879bf50 (diff) | |
| parent | 5997f97a236457f2994820d39e3738dfd61076e4 (diff) | |
Merge "[l2l3 stack] implements new nd state machine & nd buffering"
Diffstat (limited to 'common/vnf_common')
| -rw-r--r-- | common/vnf_common/config_parse.c | 2 | ||||
| -rw-r--r-- | common/vnf_common/vnf_common.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/common/vnf_common/config_parse.c b/common/vnf_common/config_parse.c index b4b99d1c..5f7ec8a6 100644 --- a/common/vnf_common/config_parse.c +++ b/common/vnf_common/config_parse.c @@ -92,13 +92,11 @@ static const struct app_link_params link_params_default = { .mq_mode = ETH_MQ_TX_NONE, }, .lpbk_mode = 0, - #ifndef VNF_ACL #ifdef LSC_GRARP .intr_conf = { .lsc = 1, /**< lsc interrupt feature enabled */ } #endif - #endif }, .promisc = 1, diff --git a/common/vnf_common/vnf_common.c b/common/vnf_common/vnf_common.c index a40d4d84..97f90210 100644 --- a/common/vnf_common/vnf_common.c +++ b/common/vnf_common/vnf_common.c @@ -63,7 +63,7 @@ uint32_t get_prv_to_pub_port(uint32_t *ip_addr, uint8_t type) case 6: { uint8_t nhipv6[16]; - get_nh_ipv6((uint8_t *)ip_addr, &dest_if, &nhipv6[0]); + get_nh_ipv6((uint8_t *)ip_addr, &dest_if, &nhipv6[0], &addr); if (dest_if != 0xff) return dest_if; return 0xff; @@ -92,7 +92,7 @@ uint32_t get_pub_to_prv_port(uint32_t *ip_addr, uint8_t type) case 6: { uint8_t nhipv6[16]; - get_nh_ipv6((uint8_t *)ip_addr, &dest_if, &nhipv6[0]); + get_nh_ipv6((uint8_t *)ip_addr, &dest_if, &nhipv6[0], &addr); if (dest_if != 0xff) return dest_if; return 0xff; |