[dpdk-stable] patch 'net/failsafe: add checks for deferred queue setup' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/18. 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. 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.

Kevin Traynor

---
>From d64c5a3813755b8c66c7c2953791edc27135afeb Mon Sep 17 00:00:00 2001
From: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
Date: Thu, 20 Sep 2018 14:55:50 +0100
Subject: [PATCH] net/failsafe: add checks for deferred queue setup

[ upstream commit c3a210a264bda441e36109af1624ecc79ff4655f ]

Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD")

Signed-off-by: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Acked-by: Gaetan Rivet <gaetan.rivet at 6wind.com>
---
 drivers/net/failsafe/failsafe_ops.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 94b9769e7..1343f02a9 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -345,4 +345,9 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,
 	int ret;
 
+	if (rx_conf->rx_deferred_start) {
+		ERROR("Rx queue deferred start is not supported");
+		return -EINVAL;
+	}
+
 	fs_lock(dev, 0);
 	rxq = dev->data->rx_queues[rx_queue_id];
@@ -506,4 +511,9 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,
 	int ret;
 
+	if (tx_conf->tx_deferred_start) {
+		ERROR("Tx queue deferred start is not supported");
+		return -EINVAL;
+	}
+
 	fs_lock(dev, 0);
 	txq = dev->data->tx_queues[tx_queue_id];
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:08.900388124 +0000
+++ 0060-net-failsafe-add-checks-for-deferred-queue-setup.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,10 +1,11 @@
-From c3a210a264bda441e36109af1624ecc79ff4655f Mon Sep 17 00:00:00 2001
+From d64c5a3813755b8c66c7c2953791edc27135afeb Mon Sep 17 00:00:00 2001
 From: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
 Date: Thu, 20 Sep 2018 14:55:50 +0100
 Subject: [PATCH] net/failsafe: add checks for deferred queue setup
 
+[ upstream commit c3a210a264bda441e36109af1624ecc79ff4655f ]
+
 Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ian Dolzhansky <ian.dolzhansky at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -14,10 +15,10 @@
  1 file changed, 10 insertions(+)
 
 diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
-index 49b155045..91105212c 100644
+index 94b9769e7..1343f02a9 100644
 --- a/drivers/net/failsafe/failsafe_ops.c
 +++ b/drivers/net/failsafe/failsafe_ops.c
-@@ -343,4 +343,9 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -345,4 +345,9 @@ fs_rx_queue_setup(struct rte_eth_dev *dev,
  	int ret;
  
 +	if (rx_conf->rx_deferred_start) {
@@ -27,7 +28,7 @@
 +
  	fs_lock(dev, 0);
  	rxq = dev->data->rx_queues[rx_queue_id];
-@@ -504,4 +509,9 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,
+@@ -506,4 +511,9 @@ fs_tx_queue_setup(struct rte_eth_dev *dev,
  	int ret;
  
 +	if (tx_conf->tx_deferred_start) {