[dpdk-stable] patch 'net/sfc: fix datapath name references in logs' has been queued to LTS release 17.11.6

[Yongseok Koh <yskoh@mellanox.com>]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From aba4ff2ebccfef8515a32549867ad3ee3e203ade Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Wed, 16 Jan 2019 12:24:40 +0000
Subject: [PATCH] net/sfc: fix datapath name references in logs

[ upstream commit 7f7bdb5987644dca493573c21cbd02ffdf68c04b ]

Rx and Tx datapath references were mixed up in a couple
of log statements and commentary blocks in the original
commit. Correct datapath name references in said places.

Fixes: f28ede500c2e ("net/sfc: support multi-process")

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/sfc.h        | 2 +-
 drivers/net/sfc/sfc_ethdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index ef980a40f..7bc7a077c 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -264,7 +264,7 @@ struct sfc_adapter {
 
 	/*
 	 * Shared memory copy of the Tx datapath name to be used by
-	 * the secondary process to find Rx datapath to be used.
+	 * the secondary process to find Tx datapath to be used.
 	 */
 	char				*dp_tx_name;
 	const struct sfc_dp_tx		*dp_tx;
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 089e8535e..5854fd76a 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -1712,13 +1712,13 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev)
 
 	dp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, sa->dp_rx_name);
 	if (dp_rx == NULL) {
-		sfc_err(sa, "cannot find %s Rx datapath", sa->dp_tx_name);
+		sfc_err(sa, "cannot find %s Rx datapath", sa->dp_rx_name);
 		rc = ENOENT;
 		goto fail_dp_rx;
 	}
 	if (~dp_rx->features & SFC_DP_RX_FEAT_MULTI_PROCESS) {
 		sfc_err(sa, "%s Rx datapath does not support multi-process",
-			sa->dp_tx_name);
+			sa->dp_rx_name);
 		rc = EINVAL;
 		goto fail_dp_rx_multi_process;
 	}
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:42.834601234 -0800
+++ 0053-net-sfc-fix-datapath-name-references-in-logs.patch	2019-03-08 09:46:40.274402000 -0800
@@ -1,14 +1,15 @@
-From 7f7bdb5987644dca493573c21cbd02ffdf68c04b Mon Sep 17 00:00:00 2001
+From aba4ff2ebccfef8515a32549867ad3ee3e203ade Mon Sep 17 00:00:00 2001
 From: Ivan Malov <ivan.malov@oktetlabs.ru>
 Date: Wed, 16 Jan 2019 12:24:40 +0000
 Subject: [PATCH] net/sfc: fix datapath name references in logs
 
+[ upstream commit 7f7bdb5987644dca493573c21cbd02ffdf68c04b ]
+
 Rx and Tx datapath references were mixed up in a couple
 of log statements and commentary blocks in the original
 commit. Correct datapath name references in said places.
 
 Fixes: f28ede500c2e ("net/sfc: support multi-process")
-Cc: stable@dpdk.org
 
 Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
@@ -18,10 +19,10 @@
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
-index 51be44037..0b852340f 100644
+index ef980a40f..7bc7a077c 100644
 --- a/drivers/net/sfc/sfc.h
 +++ b/drivers/net/sfc/sfc.h
-@@ -251,7 +251,7 @@ struct sfc_adapter {
+@@ -264,7 +264,7 @@ struct sfc_adapter {
  
  	/*
  	 * Shared memory copy of the Tx datapath name to be used by
@@ -31,10 +32,10 @@
  	char				*dp_tx_name;
  	const struct sfc_dp_tx		*dp_tx;
 diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
-index 9f59c8db9..08d3271cb 100644
+index 089e8535e..5854fd76a 100644
 --- a/drivers/net/sfc/sfc_ethdev.c
 +++ b/drivers/net/sfc/sfc_ethdev.c
-@@ -1862,13 +1862,13 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev)
+@@ -1712,13 +1712,13 @@ sfc_eth_dev_secondary_set_ops(struct rte_eth_dev *dev)
  
  	dp_rx = sfc_dp_find_rx_by_name(&sfc_dp_head, sa->dp_rx_name);
  	if (dp_rx == NULL) {