From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1A02B42BF0 for ; Wed, 31 May 2023 12:39:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E782E410D0; Wed, 31 May 2023 12:39:36 +0200 (CEST) Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by mails.dpdk.org (Postfix) with ESMTP id 54D5B40ED7 for ; Wed, 31 May 2023 07:24:03 +0200 (CEST) X-QQ-mid: bizesmtp82t1685510625t7w8fmw0 Received: from steven.localdomain ( [183.81.182.182]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 31 May 2023 13:23:43 +0800 (CST) X-QQ-SSF: 01400000000000C0D000000A0000000 X-QQ-FEAT: XBN7tc9DADJeq5xJNeXjOvOHnFpkvtxteCWHUakQ+EfncG/MNw6lgSe9M455B WZb/8cxWD/DuzwOKP+rL0JZIGSdQitK4Wg6OLEDiFwA8jUzX+aIW+epZP/bkvzruTWizEE2 K2zMy+0PGR9xYlGMo2bfvrN1NguEAaHQM4DjtPftF5zGrGkVIWOAnBruGih90/HKIN3tMKi 8lbVyvTKY6939vsq/qw8rDdep85+LurTP0LvgY08oHnOctUYrsHdJ1os++VflVr4enoPXNj JXNWJouJI9RKvPy7jWkOaBf1qqvGph77k98VT2wZP2reWR9qKqJeP1miUtiTbKUWJ+ri/ej XnJNqJPSsG2H4Y2m9GuU2UKTbtfkJkPdoldu7A0xdMgvX5C/yPQv4ahDYwmYTcrgus+51le X-QQ-GoodBg: 2 X-BIZMAIL-ID: 11917052992689942829 From: Wenbo Cao To: caowenbo@mucse.com Cc: Feifei Wang , stable@dpdk.org, Ruifeng Wang , =?UTF-8?q?Morten=20Br=C3=B8rup?= Subject: [PATCH 1/3] ring: fix dequeue parameter name Date: Wed, 31 May 2023 05:23:31 +0000 Message-Id: <20230531052333.132446-1-caowenbo@mucse.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:mucse.com:qybglogicsvrgz:qybglogicsvrgz5a-3 X-Mailman-Approved-At: Wed, 31 May 2023 12:39:35 +0200 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Feifei Wang Ring dequeue operation's parameters name should be 'cons_xx', rather than 'prod_xxx'. Fixes: 1fc73390bcf5 ("ring: refactor exported headers") Cc: stable@dpdk.org Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Acked-by: Morten Brørup --- lib/ring/rte_ring_elem_pvt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h index e24e4492ff..4b80f58980 100644 --- a/lib/ring/rte_ring_elem_pvt.h +++ b/lib/ring/rte_ring_elem_pvt.h @@ -194,12 +194,12 @@ __rte_ring_dequeue_elems_32(struct rte_ring *r, const uint32_t size, } static __rte_always_inline void -__rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t prod_head, +__rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t cons_head, void *obj_table, uint32_t n) { unsigned int i; const uint32_t size = r->size; - uint32_t idx = prod_head & r->mask; + uint32_t idx = cons_head & r->mask; uint64_t *ring = (uint64_t *)&r[1]; unaligned_uint64_t *obj = (unaligned_uint64_t *)obj_table; if (likely(idx + n <= size)) { @@ -227,12 +227,12 @@ __rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t prod_head, } static __rte_always_inline void -__rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t prod_head, +__rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t cons_head, void *obj_table, uint32_t n) { unsigned int i; const uint32_t size = r->size; - uint32_t idx = prod_head & r->mask; + uint32_t idx = cons_head & r->mask; rte_int128_t *ring = (rte_int128_t *)&r[1]; rte_int128_t *obj = (rte_int128_t *)obj_table; if (likely(idx + n <= size)) { -- 2.27.0