From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 8D53B2BF2 for ; Wed, 23 May 2018 14:10:35 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id u12-v6so7034245wrn.8 for ; Wed, 23 May 2018 05:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ffip2udIHeH7iBDtMEg6Ngs4+4nsswMMh2FbXGz13Ks=; b=dhA4CcgQ77eK9hUY5j1WGucESiJZNSTRUqrV4uEmd6T9nPc3yyXfL2O2RjgfukFWMI 8bSLOACPG0QMWKK0EmIEPbrWqSjqy92jFvpTJeKypAdAZ0wIxB7kmP9EOSsPY8PIUl1V TtRo83qkPvymD+DbzWjZM4t6TouCALXbonhje6CjuhBOUOdsnDWa8lnynylUkuB+JQaQ xhfFLZvuXyIQFDYUl5DjEpmoQZ9EyWaMbeCEfNHILZXNtvfJYCAgVj1iruGH1AyzF2gw VzK53XpN3Qu7lLUX5xY/UJbMHe6gMKzRUrZQb95wUTfHurkBfyOfPQv8gHpjdey9oAbz BNIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ffip2udIHeH7iBDtMEg6Ngs4+4nsswMMh2FbXGz13Ks=; b=M4kSJywzYJmrPf/IRjXBzzpjz9J31sclHurH6R0TU214WCnvZ/d4e0ghQLvyz8MrU8 bG5BaRf9C6BnVWUmqYrQbDvX3tToeuUayXJBBeZXwRLsIjUF2IWyfdKzu6l4xV3/SWCG GyvXsg2DndBqml+lAneSK3qz41V3Pf9L2DMjtNjbC/OdJprrcpDjKaG1z5pmzxGCDS5f JPh+QoDokt/tEYMvngam8/JBAfr2lxtXxzE9+tLRTx5LGedM4a9S4wf1Z2R2pvXWAeOa 21yl1aQp1EkjokixfCDqQWcgAvknqD1X8b+2zIUuXX5e8fRjCdKjh26m/36OxhzYEPBe hS1A== X-Gm-Message-State: ALKqPwcQwEWJulqyT/iPQQ17rDa/ZpxsX8KbQLo0JIBvu6kSbKfBqOQP 6mbQeh4KbG9wiPgfZE0U+cc= X-Google-Smtp-Source: AB8JxZo/KHdVOHw0nmsc6AS2lJRYTbdwReSe/gGdiDqem6/XI+6Awjn1qYtsn/epXbKm33bkWHB9yQ== X-Received: by 2002:a5d:4045:: with SMTP id w5-v6mr2372490wrp.96.1527077435047; Wed, 23 May 2018 05:10:35 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id h67-v6sm1597932wmg.41.2018.05.23.05.10.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 May 2018 05:10:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Andy Green Cc: Olivier Matz , dpdk stable Date: Wed, 23 May 2018 13:09:22 +0100 Message-Id: <20180523121010.8385-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180523121010.8385-1-luca.boccassi@gmail.com> References: <20180516101323.2234-2-luca.boccassi@gmail.com> <20180523121010.8385-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'ring: remove useless variables' has been queued to stable release 18.02.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2018 12:10:35 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/25/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From d19a188b625cab7391a037795ac204b4db9d97ff Mon Sep 17 00:00:00 2001 From: Andy Green Date: Thu, 17 May 2018 21:49:17 +0800 Subject: [PATCH] ring: remove useless variables [ upstream commit 712a3db0b5b2c7e6380bdeb84b803bb0e0f97c15 ] There were warnings with GCC 8.1: In function '__rte_ring_move_prod_head': rte_ring_generic.h:76:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] const uint32_t cons_tail = r->cons.tail; ^~~~~ In function '__rte_ring_move_cons_head': rte_ring_generic.h:147:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] const uint32_t prod_tail = r->prod.tail; Fixes: 0dfc98c507b1 ("ring: separate out head index manipulation") Signed-off-by: Andy Green Acked-by: Olivier Matz --- lib/librte_ring/rte_ring_generic.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h index 5b110425f..c2d482bc9 100644 --- a/lib/librte_ring/rte_ring_generic.h +++ b/lib/librte_ring/rte_ring_generic.h @@ -73,14 +73,13 @@ __rte_ring_move_prod_head(struct rte_ring *r, int is_sp, */ rte_smp_rmb(); - const uint32_t cons_tail = r->cons.tail; /* * The subtraction is done between two unsigned 32bits value * (the result is always modulo 32 bits even if we have * *old_head > cons_tail). So 'free_entries' is always between 0 * and capacity (which is < size). */ - *free_entries = (capacity + cons_tail - *old_head); + *free_entries = (capacity + r->cons.tail - *old_head); /* check that we have enough room in ring */ if (unlikely(n > *free_entries)) @@ -144,13 +143,12 @@ __rte_ring_move_cons_head(struct rte_ring *r, int is_sc, */ rte_smp_rmb(); - const uint32_t prod_tail = r->prod.tail; /* The subtraction is done between two unsigned 32bits value * (the result is always modulo 32 bits even if we have * cons_head > prod_tail). So 'entries' is always between 0 * and size(ring)-1. */ - *entries = (prod_tail - *old_head); + *entries = (r->prod.tail - *old_head); /* Set the actual entries for dequeue */ if (n > *entries) -- 2.14.2