X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=VNFs%2FDPPD-PROX%2Fhandle_cgnat.c;h=0aa6876fd52625ade2df94b7d006b64d1b9ad2ab;hb=3d17d9c7e0daae0b82973283a23f3e85d0decabd;hp=6f176c08dab6dc0ebdf8928c7ccf163af773eb89;hpb=4eca0440aee462f842567d5ef8b8796c27f4dd1b;p=samplevnf.git diff --git a/VNFs/DPPD-PROX/handle_cgnat.c b/VNFs/DPPD-PROX/handle_cgnat.c index 6f176c08..0aa6876f 100644 --- a/VNFs/DPPD-PROX/handle_cgnat.c +++ b/VNFs/DPPD-PROX/handle_cgnat.c @@ -45,8 +45,6 @@ #define BIT_8_TO_15 0x0000ff00 #define BIT_0_TO_15 0x0000ffff -#define IP4(x) x & 0xff, (x >> 8) & 0xff, (x >> 16) & 0xff, x >> 24 - struct private_key { uint32_t ip_addr; uint16_t l4_port; @@ -961,7 +959,7 @@ static void init_task_nat(struct task_base *tbase, struct task_args *targ) struct prox_port_cfg *port = find_reachable_port(targ); if (port) { - task->offload_crc = port->capabilities.tx_offload_cksum; + task->offload_crc = port->requested_tx_offload & (DEV_TX_OFFLOAD_IPV4_CKSUM | DEV_TX_OFFLOAD_UDP_CKSUM); } } @@ -973,12 +971,11 @@ static struct task_init task_init_nat = { .init = init_task_nat, .handle = handle_nat_bulk, #ifdef SOFT_CRC - .flag_features = TASK_FEATURE_TXQ_FLAGS_NOOFFLOADS|TASK_FEATURE_TXQ_FLAGS_NOMULTSEGS|TASK_FEATURE_ROUTING|TASK_FEATURE_ZERO_RX, + .flag_features = TASK_FEATURE_TXQ_FLAGS_NOOFFLOADS|TASK_FEATURE_ROUTING|TASK_FEATURE_ZERO_RX, #else - .flag_features = TASK_FEATURE_TXQ_FLAGS_NOMULTSEGS|TASK_FEATURE_ROUTING|TASK_FEATURE_ZERO_RX, + .flag_features = TASK_FEATURE_ROUTING|TASK_FEATURE_ZERO_RX, #endif .size = sizeof(struct task_nat), - .mbuf_size = 2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM, }; __attribute__((constructor)) static void reg_task_nat(void)