From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id B2D21A05D3 for ; Thu, 25 Apr 2019 17:41:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A5C2E1B5C4; Thu, 25 Apr 2019 17:41:37 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 757AA1B5E8 for ; Thu, 25 Apr 2019 17:41:35 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DB16930882A4; Thu, 25 Apr 2019 15:41:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 569255D9C6; Thu, 25 Apr 2019 15:41:31 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Rami Rosen , Maxime Coquelin , dpdk stable Date: Thu, 25 Apr 2019 16:40:06 +0100 Message-Id: <20190425154037.28778-31-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 25 Apr 2019 15:41:34 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: remove useless condition' has been queued to LTS release 18.11.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.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/01/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 450fb9794065874c32a0915a38a02094349adf09 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 27 Mar 2019 14:08:43 -0700 Subject: [PATCH] net/virtio: remove useless condition [ upstream commit 5c67301273fff63d81c343cee164a3d87918b567 ] Since previous test is for mtu < 1519 the next else if is always true. This causes the lgtm static tool to complain. Not a real issue, just cosmetic. Fixes: 76d4c652e07d ("virtio: add extended stats") Signed-off-by: Stephen Hemminger Acked-by: Rami Rosen Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 606706e94..66b2f9f35 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -781,5 +781,5 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf) else if (s < 1519) stats->size_bins[6]++; - else if (s >= 1519) + else stats->size_bins[7]++; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:48.102558738 +0100 +++ 0031-net-virtio-remove-useless-condition.patch 2019-04-25 16:37:46.740295064 +0100 @@ -1 +1 @@ -From 5c67301273fff63d81c343cee164a3d87918b567 Mon Sep 17 00:00:00 2001 +From 450fb9794065874c32a0915a38a02094349adf09 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5c67301273fff63d81c343cee164a3d87918b567 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ee30084e4..e6f3706d6 100644 +index 606706e94..66b2f9f35 100644 @@ -24 +25 @@ -@@ -1110,5 +1110,5 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf) +@@ -781,5 +781,5 @@ virtio_update_packet_stats(struct virtnet_stats *stats, struct rte_mbuf *mbuf)