From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 476F8A034F;
	Wed, 31 Mar 2021 11:50:06 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id F1527140E96;
	Wed, 31 Mar 2021 11:49:41 +0200 (CEST)
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by mails.dpdk.org (Postfix) with ESMTP id 4F6BD140E9E
 for <dev@dpdk.org>; Wed, 31 Mar 2021 11:49:33 +0200 (CEST)
IronPort-SDR: wfYnffk0V3uIHVJd7iOlYBw0yay43QUDPkp+nENX9++n1Xk32/k9LctPEXdnAOYuvBinb8iMBm
 6fUB47wL+R1A==
X-IronPort-AV: E=McAfee;i="6000,8403,9939"; a="191448584"
X-IronPort-AV: E=Sophos;i="5.81,293,1610438400"; d="scan'208";a="191448584"
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
 by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
 31 Mar 2021 02:49:33 -0700
IronPort-SDR: TiHZ1xyYWMLzqP25KBM8ZJKnUOyn15IjKP5OV61J+RoXLs6gYs4x6015yKPEL2zih766iBgGyi
 IkuDlvhAr4jg==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.81,293,1610438400"; d="scan'208";a="445603521"
Received: from dpdk51.sh.intel.com ([10.67.111.142])
 by fmsmga002.fm.intel.com with ESMTP; 31 Mar 2021 02:49:30 -0700
From: Qi Zhang <qi.z.zhang@intel.com>
To: ferruh.yigit@intel.com
Cc: dev@dpdk.org, thomas@monjalon.net, bruce.richardson@intel.com,
 xiao.w.wang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com,
 jia.guo@intel.com, qiming.yang@intel.com, haiyue.wang@intel.com,
 Qi Zhang <qi.z.zhang@intel.com>
Date: Wed, 31 Mar 2021 17:52:54 +0800
Message-Id: <20210331095254.2454439-9-qi.z.zhang@intel.com>
X-Mailer: git-send-email 2.26.2
In-Reply-To: <20210331095254.2454439-1-qi.z.zhang@intel.com>
References: <20210310121626.2019863-1-qi.z.zhang@intel.com>
 <20210331095254.2454439-1-qi.z.zhang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v6 8/8] net/igc: refine debug build option
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

1. replace RTE_LIBRTE_IGC_DEBUG_RX with RTE_ETHDEV_DEBUG_RX.
2. replace RTE_LIBRTE_IGC_DEBUG_TX whth RTE_ETHDEV_DEBUG_TX.
3. merge RTE_LIBRTE_ETHDEV_DEBUG into RTE_ETHDEV_DEBUG_TX

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/e1000/e1000_logs.c | 1 +
 drivers/net/igc/igc_logs.h     | 4 ++--
 drivers/net/igc/igc_txrx.c     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c
index 84ea0f9d4b..5835a0d62d 100644
--- a/drivers/net/e1000/e1000_logs.c
+++ b/drivers/net/e1000/e1000_logs.c
@@ -2,6 +2,7 @@
  * Copyright(c) 2018 Intel Corporation
  */
 
+#include <rte_ethdev.h>
 #include "e1000_logs.h"
 
 /* declared as extern in e1000_logs.h */
diff --git a/drivers/net/igc/igc_logs.h b/drivers/net/igc/igc_logs.h
index 6457c4d180..11071a32b5 100644
--- a/drivers/net/igc/igc_logs.h
+++ b/drivers/net/igc/igc_logs.h
@@ -20,14 +20,14 @@ extern int igc_logtype_driver;
 
 #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
 
-#ifdef RTE_LIBRTE_IGC_DEBUG_RX
+#ifdef RTE_ETHDEV_DEBUG_RX
 #define PMD_RX_LOG(level, fmt, args...) \
 	RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
 #else
 #define PMD_RX_LOG(level, fmt, args...) do { } while (0)
 #endif
 
-#ifdef RTE_LIBRTE_IGC_DEBUG_TX
+#ifdef RTE_ETHDEV_DEBUG_TX
 #define PMD_TX_LOG(level, fmt, args...) \
 	RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
 #else
diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
index c0a5d5e84f..f092709c02 100644
--- a/drivers/net/igc/igc_txrx.c
+++ b/drivers/net/igc/igc_txrx.c
@@ -1434,7 +1434,7 @@ eth_igc_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 			return i;
 		}
 
-#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+#ifdef RTE_ETHDEV_DEBUG_TX
 		ret = rte_validate_tx_offload(m);
 		if (ret != 0) {
 			rte_errno = -ret;
-- 
2.26.2