From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 82DA7A0613 for ; Wed, 28 Aug 2019 15:44:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7A0E81C219; Wed, 28 Aug 2019 15:44:08 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 5839D1C219 for ; Wed, 28 Aug 2019 15:44:07 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C680318C8919; Wed, 28 Aug 2019 13:44:06 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83083194BE; Wed, 28 Aug 2019 13:44:05 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Matan Azrad , Viacheslav Ovsiienko , dpdk stable Date: Wed, 28 Aug 2019 14:42:34 +0100 Message-Id: <20190828134234.20547-58-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Wed, 28 Aug 2019 13:44:06 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: remove redundant item from union' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/04/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 are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/401829241b8ec7d4e4bdf241431884a4d7a28ddc Thanks. Kevin Traynor --- >From 401829241b8ec7d4e4bdf241431884a4d7a28ddc Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Mon, 22 Jul 2019 14:51:58 +0000 Subject: [PATCH] net/mlx5: remove redundant item from union [ upstream commit 970eb58c475abb5902b0f00627b771f0ab12960d ] A variable of type struct ibv_cq_ex is declared in 2 unions, but isn't used. This patch removes the 2 redundant declarations. Fixes: 6218063b39a6 ("net/mlx5: refactor Rx data path") Fixes: 1d88ba171942 ("net/mlx5: refactor Tx data path") Signed-off-by: Dekel Peled Acked-by: Matan Azrad Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 1 - drivers/net/mlx5/mlx5_txq.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 45f49669c..f6edb10fe 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -774,5 +774,4 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) #endif } wq; - struct ibv_cq_ex cq_attr; } attr; unsigned int cqe_n; diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 9d1c33eba..e6020fbcb 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -366,5 +366,4 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) struct ibv_cq_init_attr_ex cq; struct ibv_qp_attr mod; - struct ibv_cq_ex cq_attr; } attr; unsigned int cqe_n; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:35.321931789 +0100 +++ 0059-net-mlx5-remove-redundant-item-from-union.patch 2019-08-28 14:32:31.742955109 +0100 @@ -1 +1 @@ -From 970eb58c475abb5902b0f00627b771f0ab12960d Mon Sep 17 00:00:00 2001 +From 401829241b8ec7d4e4bdf241431884a4d7a28ddc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 970eb58c475abb5902b0f00627b771f0ab12960d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 39b8b7a8f..0535ce347 100644 +index 45f49669c..f6edb10fe 100644 @@ -26 +27 @@ -@@ -840,5 +840,4 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) +@@ -774,5 +774,4 @@ mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) @@ -33 +34 @@ -index 2f3aa5b28..dbad361ac 100644 +index 9d1c33eba..e6020fbcb 100644 @@ -36 +37 @@ -@@ -389,5 +389,4 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx) +@@ -366,5 +366,4 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)