From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id AA74A1B48E for ; Thu, 22 Nov 2018 17:51:34 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 187C580F8D; Thu, 22 Nov 2018 16:51:34 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0BE417BA0; Thu, 22 Nov 2018 16:51:32 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Thu, 22 Nov 2018 16:49:02 +0000 Message-Id: <20181122164957.13003-10-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 22 Nov 2018 16:51:34 +0000 (UTC) Subject: [dpdk-stable] patch 'net/qede: remove invalid config option checks' has been queued to stable release 18.08.1 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, 22 Nov 2018 16:51:35 -0000 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/28/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 59b962312872e9db4b46b6521ea187cdf247e314 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 12 Oct 2018 16:42:52 -0700 Subject: [PATCH] net/qede: remove invalid config option checks [ upstream commit dcf3d57fa4e35d49ea0b1d01514eb702aac4a23f ] Now that logging of initialization is controlled by dynamic debug level, remove the #ifdef for RTE_LIBRTE_QEDE_DEBUG_INIT since that config option does not exist in common_base and is not documented. Fixes: 69b6573980c1 ("net/qede: implement dynamic logging") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/qede/qede_ethdev.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index bd906b293..d5493a7d7 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1652,13 +1652,10 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete) static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev) { -#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT struct qede_dev *qdev = eth_dev->data->dev_private; struct ecore_dev *edev = &qdev->edev; - - PMD_INIT_FUNC_TRACE(edev); -#endif - enum qed_filter_rx_mode_type type = QED_FILTER_RX_MODE_TYPE_PROMISC; + PMD_INIT_FUNC_TRACE(edev); + if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1) type |= QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC; @@ -1669,10 +1666,8 @@ static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev) static void qede_promiscuous_disable(struct rte_eth_dev *eth_dev) { -#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT struct qede_dev *qdev = eth_dev->data->dev_private; struct ecore_dev *edev = &qdev->edev; PMD_INIT_FUNC_TRACE(edev); -#endif if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1) @@ -3312,10 +3307,8 @@ static int qede_eth_dev_init(struct rte_eth_dev *eth_dev) static int qede_dev_common_uninit(struct rte_eth_dev *eth_dev) { -#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT struct qede_dev *qdev = eth_dev->data->dev_private; struct ecore_dev *edev = &qdev->edev; PMD_INIT_FUNC_TRACE(edev); -#endif /* only uninitialize in the primary process */ -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:32.531099414 +0000 +++ 0010-net-qede-remove-invalid-config-option-checks.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,14 +1,15 @@ -From dcf3d57fa4e35d49ea0b1d01514eb702aac4a23f Mon Sep 17 00:00:00 2001 +From 59b962312872e9db4b46b6521ea187cdf247e314 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 12 Oct 2018 16:42:52 -0700 Subject: [PATCH] net/qede: remove invalid config option checks +[ upstream commit dcf3d57fa4e35d49ea0b1d01514eb702aac4a23f ] + Now that logging of initialization is controlled by dynamic debug level, remove the #ifdef for RTE_LIBRTE_QEDE_DEBUG_INIT since that config option does not exist in common_base and is not documented. Fixes: 69b6573980c1 ("net/qede: implement dynamic logging") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c -index 18d244a93..5745832b9 100644 +index bd906b293..d5493a7d7 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c -@@ -1381,13 +1381,10 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete) +@@ -1652,13 +1652,10 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete) static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev) { -#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT @@ -36,7 +37,7 @@ + if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1) type |= QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC; -@@ -1398,10 +1395,8 @@ static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev) +@@ -1669,10 +1666,8 @@ static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev) static void qede_promiscuous_disable(struct rte_eth_dev *eth_dev) { -#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT @@ -47,7 +48,7 @@ -#endif if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1) -@@ -2649,10 +2644,8 @@ static int qede_eth_dev_init(struct rte_eth_dev *eth_dev) +@@ -3312,10 +3307,8 @@ static int qede_eth_dev_init(struct rte_eth_dev *eth_dev) static int qede_dev_common_uninit(struct rte_eth_dev *eth_dev) { -#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT