[dpdk-stable] patch 'net/e1000: do not error out if Rx drop enable is set' 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/27/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 9107f800fbb8c31287f0070828f63f83331759bf Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Fri, 27 Jul 2018 18:26:07 +0100
Subject: [PATCH] net/e1000: do not error out if Rx drop enable is set

[ upstream commit d7812ffd83588c724d2f291f2030c9994f9d1113 ]

rx_drop_en is an optimization that does nothing on single-queue
devices like e1000. Do not force applications that do not care to
select per-devices optimizations flags by returning an error, just
log it and carry on.

Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)")

Signed-off-by: Luca Boccassi <bluca at debian.org>
Acked-by: Wei Zhao <wei.zhao1 at intel.com>
---
 drivers/net/e1000/em_rxtx.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 5860e93d5..46bdf519c 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -1419,10 +1419,11 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
 
 	/*
-	 * EM devices don't support drop_en functionality
+	 * EM devices don't support drop_en functionality.
+	 * It's an optimization that does nothing on single-queue devices,
+	 * so just log the issue and carry on.
 	 */
 	if (rx_conf->rx_drop_en) {
-		PMD_INIT_LOG(ERR, "drop_en functionality not supported by "
+		PMD_INIT_LOG(NOTICE, "drop_en functionality not supported by "
 			     "device");
-		return -EINVAL;
 	}
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.671399779 +0000
+++ 0063-net-e1000-do-not-error-out-if-Rx-drop-enable-is-set.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,15 +1,16 @@
-From d7812ffd83588c724d2f291f2030c9994f9d1113 Mon Sep 17 00:00:00 2001
+From 9107f800fbb8c31287f0070828f63f83331759bf Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <bluca at debian.org>
 Date: Fri, 27 Jul 2018 18:26:07 +0100
 Subject: [PATCH] net/e1000: do not error out if Rx drop enable is set
 
+[ upstream commit d7812ffd83588c724d2f291f2030c9994f9d1113 ]
+
 rx_drop_en is an optimization that does nothing on single-queue
 devices like e1000. Do not force applications that do not care to
 select per-devices optimizations flags by returning an error, just
 log it and carry on.
 
 Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)")
-Cc: stable at dpdk.org
 
 Signed-off-by: Luca Boccassi <bluca at debian.org>
 Acked-by: Wei Zhao <wei.zhao1 at intel.com>
@@ -18,10 +19,10 @@
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
-index 087e68304..a9cd76518 100644
+index 5860e93d5..46bdf519c 100644
 --- a/drivers/net/e1000/em_rxtx.c
 +++ b/drivers/net/e1000/em_rxtx.c
-@@ -1418,10 +1418,11 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1419,10 +1419,11 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev,
  
  	/*
 -	 * EM devices don't support drop_en functionality