summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2017-07-14 06:22:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-14 06:22:14 +0000
commit735b1362bf72d8bfec56e4964f43b60170144213 (patch)
tree9fe72d84a08d976f114a979b927d4bfaf729e449
parent04714a4f30a061f39cda864dec2f350e0051a56a (diff)
parent56400cedab3a066b10401f676a8ee86c2463ff53 (diff)
Merge "vCGNAPT: correcting to use default rte_ring_dequeue"
-rw-r--r--VNFs/vCGNAPT/pipeline/pipeline_timer_be.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_timer_be.c b/VNFs/vCGNAPT/pipeline/pipeline_timer_be.c
index bfe8f5c4..7ba4964a 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_timer_be.c
+++ b/VNFs/vCGNAPT/pipeline/pipeline_timer_be.c
@@ -113,7 +113,7 @@ void timer_thread_enqueue(struct pipeline_cgnapt_entry_key *egress_key,
sizeof(struct cgnapt_table_entry));
}
- if (rte_ring_mp_enqueue(timer_ring, (void *)tk_ptr) == -ENOBUFS)
+ if (rte_ring_enqueue(timer_ring, (void *)tk_ptr) == -ENOBUFS)
printf("Ring enqueue failed: trying to enqueue\n");
}
@@ -126,7 +126,7 @@ void timer_thread_dequeue(void)
struct timer_key *tk_ptr;
int ret;
- ret = rte_ring_sc_dequeue(timer_ring, (void *)&tk_ptr);
+ ret = rte_ring_dequeue(timer_ring, (void *)&tk_ptr);
if (ret == -ENOENT)
return;
@@ -444,8 +444,8 @@ static void *pipeline_timer_init(struct pipeline_params *params, void *arg)
if (timer_key_mempool == NULL)
rte_panic("timer_key_mempool create error\n");
- timer_ring = rte_ring_create("TIMER_RING",
- timer_ring_alloc_cnt, rte_socket_id(), 0);
+ timer_ring = rte_ring_create("TIMER_RING", timer_ring_alloc_cnt,
+ rte_socket_id(), RING_F_SC_DEQ);
if (timer_ring == NULL)
rte_panic("timer_ring creation failed");