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 EF350A0096 for ; Wed, 8 May 2019 18:03:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E46F44C77; Wed, 8 May 2019 18:03:00 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4D770DE3 for ; Wed, 8 May 2019 18:02:59 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFAFE300502A; Wed, 8 May 2019 16:02:58 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id B942760C82; Wed, 8 May 2019 16:02:57 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Wed, 8 May 2019 17:02:12 +0100 Message-Id: <20190508160233.2648-15-ktraynor@redhat.com> In-Reply-To: <20190508160233.2648-1-ktraynor@redhat.com> References: <20190508160233.2648-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 08 May 2019 16:02:58 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix comments mixing Rx and Tx' 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/14/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/52a1dffe4a679b62131d9e1d73ddf1f0be9aaf03 Thanks. Kevin Traynor --- >From 52a1dffe4a679b62131d9e1d73ddf1f0be9aaf03 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Mon, 22 Apr 2019 18:24:11 +0300 Subject: [PATCH] net/mlx5: fix comments mixing Rx and Tx [ upstream commit ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 ] In mlx5_rxq.c, in some comments, text includes "Tx" instead of "Rx". In mlx5_txq.c, in some comments, text includes "Rx" instead of "Tx". This patch fixes these typos. Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects") Fixes: a1366b1a2be3 ("net/mlx5: add reference counter on DPDK Rx queues") Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_rxq.c | 6 +++--- drivers/net/mlx5/mlx5_txq.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 2f6099914..e2728f273 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1495,5 +1495,5 @@ error: * Pointer to Ethernet device. * @param idx - * TX queue index. + * RX queue index. * * @return @@ -1522,5 +1522,5 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) * Pointer to Ethernet device. * @param idx - * TX queue index. + * RX queue index. * * @return @@ -1555,5 +1555,5 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) * Pointer to Ethernet device. * @param idx - * TX queue index. + * RX queue index. * * @return diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index d18561740..f69520ba8 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -347,5 +347,5 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst) * Pointer to Ethernet device. * @param idx - * Queue index in DPDK Rx queue array + * Queue index in DPDK Tx queue array. * * @return @@ -555,5 +555,5 @@ error: * Pointer to Ethernet device. * @param idx - * Queue index in DPDK Rx queue array + * Queue index in DPDK Tx queue array. * * @return -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 16:33:58.230521955 +0100 +++ 0015-net-mlx5-fix-comments-mixing-Rx-and-Tx.patch 2019-05-08 16:33:57.370579495 +0100 @@ -1 +1 @@ -From ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 Mon Sep 17 00:00:00 2001 +From 52a1dffe4a679b62131d9e1d73ddf1f0be9aaf03 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 836bec95e..9f27f607b 100644 +index 2f6099914..e2728f273 100644 @@ -26 +27 @@ -@@ -1494,5 +1494,5 @@ error: +@@ -1495,5 +1495,5 @@ error: @@ -33 +34 @@ -@@ -1521,5 +1521,5 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) +@@ -1522,5 +1522,5 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) @@ -40 +41 @@ -@@ -1554,5 +1554,5 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) +@@ -1555,5 +1555,5 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) @@ -48 +49 @@ -index 9965b2b77..dbe074fe3 100644 +index d18561740..f69520ba8 100644 @@ -51 +52 @@ -@@ -389,5 +389,5 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst) +@@ -347,5 +347,5 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst) @@ -58 +59 @@ -@@ -598,5 +598,5 @@ error: +@@ -555,5 +555,5 @@ error: