From 87b15cebdaca21f6725637abeceec0f19f4eec51 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Sun, 28 Apr 2019 21:16:30 -0700 Subject: svm: more fifo refactor/cleanup Change-Id: Ie76c69641c8598164d0d00fd498018037258fd86 Signed-off-by: Florin Coras --- src/tests/vnet/session/udp_echo.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/tests/vnet') diff --git a/src/tests/vnet/session/udp_echo.c b/src/tests/vnet/session/udp_echo.c index f1ecca8e926..3a70d3964c6 100644 --- a/src/tests/vnet/session/udp_echo.c +++ b/src/tests/vnet/session/udp_echo.c @@ -447,10 +447,9 @@ cut_through_thread_fn (void *arg) { /* We read from the tx fifo and write to the rx fifo */ if (utm->have_return || do_dequeue) - actual_transfer = svm_fifo_dequeue_nowait (rx_fifo, - vec_len - (my_copy_buffer), - my_copy_buffer); + actual_transfer = svm_fifo_dequeue (rx_fifo, + vec_len (my_copy_buffer), + my_copy_buffer); else { /* We don't do anything with the data, drop it */ @@ -467,8 +466,8 @@ cut_through_thread_fn (void *arg) buffer_offset = 0; while (actual_transfer > 0) { - rv = svm_fifo_enqueue_nowait (tx_fifo, actual_transfer, - my_copy_buffer + buffer_offset); + rv = svm_fifo_enqueue (tx_fifo, actual_transfer, + my_copy_buffer + buffer_offset); if (rv > 0) { actual_transfer -= rv; -- cgit 1.2.3-korg