From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id CFD7A1B512 for ; Fri, 30 Nov 2018 00:14:20 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:20:14 +0200 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 wATNCW83032075; Fri, 30 Nov 2018 01:14:18 +0200 From: Yongseok Koh To: Luca Boccassi Cc: Wei Zhao , dpdk stable Date: Thu, 29 Nov 2018 15:10:57 -0800 Message-Id: <20181129231202.30436-63-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/e1000: do not error out if Rx drop enable is set' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 29 Nov 2018 23:14:21 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From ec3bc67500491d992901c0eef730a8df526a3f9c Mon Sep 17 00:00:00 2001 From: Luca Boccassi 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 Acked-by: Wei Zhao --- 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 1d8f0794d..a15ce222a 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1369,12 +1369,13 @@ 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; } /* Free memory prior to re-allocation if needed. */ -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:48.015642762 -0800 +++ 0063-net-e1000-do-not-error-out-if-Rx-drop-enable-is-set.patch 2018-11-29 15:01:45.164964000 -0800 @@ -1,15 +1,16 @@ -From d7812ffd83588c724d2f291f2030c9994f9d1113 Mon Sep 17 00:00:00 2001 +From ec3bc67500491d992901c0eef730a8df526a3f9c Mon Sep 17 00:00:00 2001 From: Luca Boccassi 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@dpdk.org Signed-off-by: Luca Boccassi Acked-by: Wei Zhao @@ -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 1d8f0794d..a15ce222a 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c -@@ -1417,12 +1417,13 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, +@@ -1369,12 +1369,13 @@ eth_em_rx_queue_setup(struct rte_eth_dev *dev, } /*