[dpdk-stable] patch 'net/mlx5: fix comments mixing Rx and Tx' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 03:01:00 CEST 2019


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 <dekelp at mellanox.com>
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 <dekelp at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 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 <dekelp at mellanox.com>
 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 at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Shahaf Shuler <shahafs at mellanox.com>
@@ -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


More information about the stable mailing list