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 75023A046B for ; Tue, 23 Jul 2019 03:04:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59B6F1BFE6; Tue, 23 Jul 2019 03:04:06 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 0EE961BEF8 for ; Tue, 23 Jul 2019 03:04:04 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:04:02 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HgJ026580; Tue, 23 Jul 2019 04:04:01 +0300 From: Yongseok Koh To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Mon, 22 Jul 2019 18:01:00 -0700 Message-Id: <20190723010115.6446-93-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix comments mixing Rx and Tx' has been queued to LTS release 17.11.7 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 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Thanks. Yongseok --- >From fe75912024b1b7b46473925d1cef375edb42ae29 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 7161825a57..3048da985d 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1030,7 +1030,7 @@ error: * @param dev * Pointer to Ethernet device. * @param idx - * TX queue index. + * RX queue index. * * @return * A pointer to the queue if it exists, NULL otherwise. @@ -1060,7 +1060,7 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) * @param dev * Pointer to Ethernet device. * @param idx - * TX queue index. + * RX queue index. * * @return * 1 while a reference on it exists, 0 when freed. @@ -1094,7 +1094,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) * @param dev * Pointer to Ethernet device. * @param idx - * TX queue index. + * RX queue index. * * @return * 1 if the queue can be released, negative errno otherwise and rte_errno is diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 2ead2177fb..9c25efa451 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -301,7 +301,7 @@ mlx5_tx_uar_remap(struct rte_eth_dev *dev, int fd) * @param dev * Pointer to Ethernet device. * @param idx - * Queue index in DPDK Rx queue array + * Queue index in DPDK Tx queue array. * * @return * The Verbs object initialised, NULL otherwise and rte_errno is set. @@ -507,7 +507,7 @@ error: * @param dev * Pointer to Ethernet device. * @param idx - * Queue index in DPDK Rx queue array + * Queue index in DPDK Tx queue array. * * @return * The Verbs object if it exists. -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:11.484383653 -0700 +++ 0093-net-mlx5-fix-comments-mixing-Rx-and-Tx.patch 2019-07-22 17:55:06.447478000 -0700 @@ -1,8 +1,10 @@ -From ebd4df0ffceef3ab4ad6ebf6f29c55363d045700 Mon Sep 17 00:00:00 2001 +From fe75912024b1b7b46473925d1cef375edb42ae29 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". @@ -10,7 +12,6 @@ Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects") Fixes: a1366b1a2be3 ("net/mlx5: add reference counter on DPDK Rx queues") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler @@ -20,10 +21,10 @@ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c -index 836bec95e5..9f27f607b7 100644 +index 7161825a57..3048da985d 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c -@@ -1493,7 +1493,7 @@ error: +@@ -1030,7 +1030,7 @@ error: * @param dev * Pointer to Ethernet device. * @param idx @@ -32,7 +33,7 @@ * * @return * A pointer to the queue if it exists, NULL otherwise. -@@ -1520,7 +1520,7 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) +@@ -1060,7 +1060,7 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) * @param dev * Pointer to Ethernet device. * @param idx @@ -41,7 +42,7 @@ * * @return * 1 while a reference on it exists, 0 when freed. -@@ -1553,7 +1553,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) +@@ -1094,7 +1094,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) * @param dev * Pointer to Ethernet device. * @param idx @@ -51,10 +52,10 @@ * @return * 1 if the queue can be released, negative errno otherwise and rte_errno is diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c -index 9965b2b771..dbe074fe3b 100644 +index 2ead2177fb..9c25efa451 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c -@@ -388,7 +388,7 @@ is_empw_burst_func(eth_tx_burst_t tx_pkt_burst) +@@ -301,7 +301,7 @@ mlx5_tx_uar_remap(struct rte_eth_dev *dev, int fd) * @param dev * Pointer to Ethernet device. * @param idx @@ -63,7 +64,7 @@ * * @return * The Verbs object initialised, NULL otherwise and rte_errno is set. -@@ -597,7 +597,7 @@ error: +@@ -507,7 +507,7 @@ error: * @param dev * Pointer to Ethernet device. * @param idx