[PATCH] crypto/scheduler: change ordering ring dequeue

[PATCH] crypto/scheduler: change ordering ring dequeue

[Fan Zhang]

Commit <ecaed092b677> ("ring: return remaining entry count when
dequeuing") changed the return of rte_ring_sc_dequeue_bulk, this
patch updates the scheduler to comply with this change.

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
 drivers/crypto/scheduler/scheduler_pmd_private.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/scheduler/scheduler_pmd_private.h b/drivers/crypto/scheduler/scheduler_pmd_private.h
index 33edd1d..421dae3 100644
--- a/drivers/crypto/scheduler/scheduler_pmd_private.h
+++ b/drivers/crypto/scheduler/scheduler_pmd_private.h
@@ -132,7 +132,7 @@ scheduler_order_drain(struct rte_ring *order_ring,
 	struct rte_crypto_op *op;
 	uint32_t nb_objs = rte_ring_count(order_ring);
 	uint32_t nb_ops_to_deq = 0;
-	int status = -1;
+	uint32_t nb_ops_deqd = 0;
 
 	if (nb_objs > nb_ops)
 		nb_objs = nb_ops;
@@ -145,10 +145,10 @@ scheduler_order_drain(struct rte_ring *order_ring,
 	}
 
 	if (nb_ops_to_deq)
-		status = rte_ring_sc_dequeue_bulk(order_ring, (void **)ops,
-				nb_ops_to_deq, NULL);
+		nb_ops_deqd = rte_ring_sc_dequeue_bulk(order_ring,
+				(void **)ops, nb_ops_to_deq, NULL);
 
-	return (status == 0) ? nb_ops_to_deq : 0;
+	return nb_ops_deqd;
 }
 /** device specific operations function pointer structure */
 extern struct rte_cryptodev_ops *rte_crypto_scheduler_pmd_ops;
-- 
2.7.4

Re: [PATCH] crypto/scheduler: change ordering ring dequeue

[De Lara Guarch, Pablo]

> -----Original Message-----
> From: Zhang, Roy Fan
> Sent: Wednesday, April 19, 2017 3:47 PM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo
> Subject: [PATCH] crypto/scheduler: change ordering ring dequeue
> 
> Commit <ecaed092b677> ("ring: return remaining entry count when
> dequeuing") changed the return of rte_ring_sc_dequeue_bulk, this
> patch updates the scheduler to comply with this change.
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>

Modified title to: "crypto/scheduler fix ring dequeue return handling"
Added "Fixes: 8a48e039432b ("crypto/scheduler: optimize crypto op ordering")"

Applied to dpdk-next-crypto.

Thanks,
Pablo