diff options
author | Luca Boccassi <luca.boccassi@gmail.com> | 2018-09-03 10:48:52 +0100 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-09-03 10:49:31 +0100 |
commit | cbcf3d44176009673fbcd7d15671bef56c021f6b (patch) | |
tree | 03ac41bbf9f5f9f238e62de84d43dcce721b8dab /lib/librte_ring/rte_ring.h | |
parent | 1d9284040a0ba38d86e6eeffdb25f36eeb7a44e1 (diff) | |
parent | 6e7cbd63706f3435b9d9a2057a37db1da01db9a7 (diff) |
Merge branch 'upstream-17.11-stable' into 17.11.x
Change-Id: Id5d87fa34325cf80217a1f633c9dc1808e931af8
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_ring/rte_ring.h')
-rw-r--r-- | lib/librte_ring/rte_ring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index 7069d52e..fc433b05 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -582,7 +582,7 @@ __rte_ring_do_dequeue(struct rte_ring *r, void **obj_table, uint32_t cons_head, cons_next; uint32_t entries; - n = __rte_ring_move_cons_head(r, is_sc, n, behavior, + n = __rte_ring_move_cons_head(r, (int)is_sc, n, behavior, &cons_head, &cons_next, &entries); if (n == 0) goto end; |