From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 55119A0597; Fri, 17 Apr 2020 23:58:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 795651EB84; Fri, 17 Apr 2020 23:58:05 +0200 (CEST) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id 05B061EB73 for ; Fri, 17 Apr 2020 23:58:02 +0200 (CEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200417215801euoutp01aab495f9d8a9b13e968d2312aac71370~GujsD2EvQ0105301053euoutp01H; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200417215801euoutp01aab495f9d8a9b13e968d2312aac71370~GujsD2EvQ0105301053euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1587160681; bh=jxEEHVfJ9JRxPlFwTEAYX2g1ZtovxtMT0lkzkO8cyNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rw58IW4dlARrRhUQIQ7FdPP/im8lCNxvWvOXB9Grj8FXII7sLkLWuKga7fyLhmFyC FLi3cj4HmNzWY/2/tD1c/gbmdVS5DUmtyVj/MX7+gP8qTl0UO59AkxCAjs+3QT5mZU 1AtqvYWVM6EBr6uJQ/CfYSONPtMokeSXEwfEoPQg= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20200417215801eucas1p1542346f619d44e0497872bd0596d864b~Gujr6ChDg1204912049eucas1p1N; Fri, 17 Apr 2020 21:58:01 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id EE.B4.60679.9662A9E5; Fri, 17 Apr 2020 22:58:01 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa~GujqwYYct0152001520eucas1p10; Fri, 17 Apr 2020 21:57:59 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200417215759eusmtrp1ac958f62b42217524c5a0fd119a47c33~GujqvSmCT0397603976eusmtrp1p; Fri, 17 Apr 2020 21:57:59 +0000 (GMT) X-AuditID: cbfec7f4-0cbff7000001ed07-75-5e9a2669cdaf Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 5D.52.07950.7662A9E5; Fri, 17 Apr 2020 22:57:59 +0100 (BST) Received: from localhost.localdomain (unknown [106.210.88.70]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200417215756eusmtip2930bcb92118600e358fbffb23ab56a01~GujnwvCR00325203252eusmtip2m; Fri, 17 Apr 2020 21:57:56 +0000 (GMT) From: Lukasz Wojciechowski To: Thomas Monjalon , Igor Russkikh , Pavel Belous , Wenzhuo Lu , Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin , Igor Chauskin , John Daley , Hyong Youb Kim , Qi Zhang , Xiao Wang , Ziyang Xuan , Xiaoyun Wang , Guoyang Zhou , "Wei Hu (Xavier)" , "Min Hu (Connor)" , Yisen Zhuang , Beilei Xing , Jingjing Wu , Qiming Yang , Konstantin Ananyev , Rasesh Mody , Shahed Shaikh , Jasvinder Singh , Cristian Dumitrescu , Maxime Coquelin , Zhihong Wang , Xiaolong Ye , Yong Wang , Ferruh Yigit , Andrew Rybchenko , Olivier Matz Cc: dev@dpdk.org Date: Fri, 17 Apr 2020 23:57:25 +0200 Message-Id: <20200417215739.23180-4-l.wojciechow@partner.samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0VSa0xTZxjO23PpaWfJWTX6pdOR1OgmUVR0yZvMGXfRnBjnFv4sWTLxCCdI pIituOkvYogMLNMAA1tCqHQgE51UAUELSoGidmzjUgEjE1Md1EFlxVm5yNZyqv758rzv8zzv LR9HaX9hdVxaxmHJmCGm61k13eie/m1d2mrrng3jwyyOFIefk5M5CqzKeQ5Y+CBbgYHgVQX2 9/5N4/0WjxJz3A9ZdP0zBljQOUBjmb2Uwf8q0jHoGlWixTYF6Jy5RePTuUoa3XlOGquCPgr7 xjoZbDjuUOCUORFL606xWNzcBDjeWElh19VqBoMjYVfDry8BfcM/A94YbVfi3PgH2JabT6H9 vIfFmQs/0Xilp1CBE3l59LaVQs+p+yDU/JHPCN3nBhmheNbBCDO2KkbI6ZhgBLvTrxCKzvZQ gnuoRCk8bfWygr8+U6h99IIVAhUT7Jear9VbUqT0tCOScf3Wver95Zd62UxzyndXSoJMNvQn 5oOKI/xmcvtBN5UPak7L1wAp7bdGg2dA2kMtrBxMAXk5UhtmuAVL812NnD8H5HqPTfFaFPB2 KyN1Wf4j0mH5l4kQS/h7amIvc1IRguJ54vvzLyaCF/O7iLPBtpCn+VUk1OqBCNbw24m1pImW B4wltXU3FzQqfgep8ocgUpTwYxx5cWaQkUWfkb7c56yMF5MnXfVKGS8nniIzLRsagXhnp6Pu G0AGCmqiqg9J+/wsG1mO4teQS9fWy+mPScGdNpB3jiGDE2/LC8SQwsbS6Ck05PsTWlkdTx6b f4RXbecuPorOLxDfBUv0QhYg5TenqdMQa33TzAZwHpZJWSZDqmRKyJC+jTeJBlNWRmp88kHD ZQj/Ys9817MmuDa3zwU8B/pFmg1myx4tIx4xHTW4gHCUfommbUc4pUkRjx6TjAeTjFnpkskF 73C0fplmU6X/Gy2fKh6WDkhSpmR8xSo4lS4b4JDD3qnv3htYdSbX4U7aeLc8dudk04mKlNTl Ze/1Tpc7DNuOTVriygI63dZ3Yzx33of6RX1vecSh4a+qf0/ervI62j4fVy79YXVrc5pP7Bho ifskRCddPLm0aEj1BEaHV5yuqA5hwuNEm3f+1vzs2hUJI1/stibr6lyuok93P/TradN+cWMc ZTSJ/wOMwfB/wQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAAzWSa0hTcRjG++9ctkmrwzQ6SZCcqKBodrzkq2X1pTgfItKkwEwdepqRc7Kz SUqRmGAuwy6maBdNXXYxTNu8wLq4SisNvDUN7xl5v22lZXbZlL49PM/v4X0/PBJMfpnwlJxK 0PHaBGU8Q7rhTX8a+7arNhdE7mjJ8IOBnF4SLs2ki8CYPofgWn+qCKbsNSLoaBvHoedZkxjS GwZJsM6OILj8phOHmyV5BPwtjAe7dVgM+UUOBJaFtzhMLxbj0JBpwcFoH8KgfeQNAea0ShE4 skIh70k2CTl1tQgmqosxaKy5R4B9wNkyN/9GMNT7AMGL4VdiWJzwh/oMAwYlD5tIWCgvxeFp 6zURTGZm4vs2cq3ZPYi732IguA9lXQSX86uS4BaKjASX/nqS4EosoyLu+t1WjGv4lCvmpp9/ JLlRUyL36MsPkpsqnCQPy8IVu7UavY73itMIumDmOAs+CjYQFD5+gQrWN+BEkI8/471ndywf fyqJ13rviVbE3a5oIxOzYs88zbUTqagj1IAkEpryo+tsMgNyk8gpI6I/3XlHLvvr6Zk2yoCk TulOL9oM5DIzi+hvDx4jV0BSwfTr/O+EK/Cg5txo+8V2kSvAKIoe6vtKuLQ7dZC2mIswl8ap TfT886alsozaTxfk1uLLFzbQj568XGKk1AHaODq/xMidzODge/EVtKoIrXiIPHi9oFapBR+F oFQL+gSVIkajrkLOKVQ3/DTVIsPUESuiJIhZKduRlR8pJ5RJQrLaimgJxnjI6g84LVmsMjmF 12qitPp4XrAif+dTVzHPNTEa57ASdFGsPxsAgWyAb4DvTmDWyi5S9RFySqXU8ad5PpHX/u+J JFLPVNQ8NuYnZR2fm/GTW7rDjb2Pbf1ny6OiuhaDts+GRH9Y5zCGjW9Ion6Zd20bwss6Oo+N uxWouCsR5/broLyb728Osq2hpF2NFarKzvCUC+enjIW3mNUm06Gj1T8daS0nMry2Zatv6MMY Ft9a1u7VXVU4UzqQZ6kI6QlOidh7ycbgQpyS3YppBeU/6zlOOiADAAA= X-CMS-MailID: 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200417215759eucas1p1c0fcc3046d87dc9de1d15572ba6b7caa References: <20200417215739.23180-1-l.wojciechow@partner.samsung.com> Subject: [dpdk-dev] [PATCH v1 03/17] ethdev: replace library debug flag with global one X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use global debug flag RTE_DEBUG instead of RTE_LIBRTE_ETHDEV_DEBUG. The old define is completely removed from source code and config. The changes were applied also to all drivers using this flag. Signed-off-by: Lukasz Wojciechowski --- config/common_base | 1 - drivers/net/atlantic/atl_rxtx.c | 2 +- drivers/net/e1000/em_rxtx.c | 2 +- drivers/net/e1000/igb_rxtx.c | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enic/enic_rxtx.c | 2 +- drivers/net/fm10k/fm10k_rxtx.c | 2 +- drivers/net/hinic/hinic_pmd_tx.c | 2 +- drivers/net/hns3/hns3_rxtx.c | 2 +- drivers/net/i40e/i40e_rxtx.c | 2 +- drivers/net/iavf/iavf_rxtx.c | 2 +- drivers/net/ice/ice_rxtx.c | 2 +- drivers/net/ixgbe/ixgbe_rxtx.c | 2 +- drivers/net/qede/qede_rxtx.c | 4 ++-- drivers/net/softnic/rte_eth_softnic.c | 2 +- drivers/net/softnic/rte_eth_softnic_thread.c | 2 +- drivers/net/virtio/virtio_rxtx.c | 2 +- drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 +- lib/librte_ethdev/rte_ethdev.h | 16 ++++++++-------- lib/librte_net/rte_net.h | 4 ++-- 20 files changed, 28 insertions(+), 29 deletions(-) diff --git a/config/common_base b/config/common_base index c5be57f11..16a8f09b6 100644 --- a/config/common_base +++ b/config/common_base @@ -149,7 +149,6 @@ CONFIG_RTE_LIBRTE_KVARGS=y # Compile generic ethernet library # CONFIG_RTE_LIBRTE_ETHER=y -CONFIG_RTE_LIBRTE_ETHDEV_DEBUG=n CONFIG_RTE_MAX_ETHPORTS=32 CONFIG_RTE_MAX_QUEUES_PER_PORT=1024 CONFIG_RTE_LIBRTE_IEEE1588=n diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c index 449ffd454..eae54df22 100644 --- a/drivers/net/atlantic/atl_rxtx.c +++ b/drivers/net/atlantic/atl_rxtx.c @@ -821,7 +821,7 @@ atl_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index 49c53712a..c4083ff00 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -626,7 +626,7 @@ eth_em_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 684fa4ad8..6a78f26e6 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -641,7 +641,7 @@ eth_igb_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 665afee4f..b9855e91b 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -2145,7 +2145,7 @@ eth_ena_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c index 6a8718c08..c42d563b4 100644 --- a/drivers/net/enic/enic_rxtx.c +++ b/drivers/net/enic/enic_rxtx.c @@ -414,7 +414,7 @@ uint16_t enic_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, rte_errno = ENOTSUP; return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c index 4accaa2cd..43d773f08 100644 --- a/drivers/net/fm10k/fm10k_rxtx.c +++ b/drivers/net/fm10k/fm10k_rxtx.c @@ -710,7 +710,7 @@ fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c index 64ec2c119..41d5a25b6 100644 --- a/drivers/net/hinic/hinic_pmd_tx.c +++ b/drivers/net/hinic/hinic_pmd_tx.c @@ -804,7 +804,7 @@ hinic_tx_offload_pkt_prepare(struct rte_mbuf *m, !(ol_flags & PKT_TX_TUNNEL_VXLAN)) return -ENOTSUP; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (rte_validate_tx_offload(m) != 0) return -EINVAL; #endif diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index ec6d19f58..45aa64b70 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2296,7 +2296,7 @@ hns3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 5e7c86ed8..282baf514 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1499,7 +1499,7 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 85d9a8e3b..8122d35be 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -1689,7 +1689,7 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 1c9f31efd..fd8ed2573 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3037,7 +3037,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 2e20e18c7..6964c4e52 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -992,7 +992,7 @@ ixgbe_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index b81788ca4..646eb2275 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -2156,7 +2156,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts, uint64_t ol_flags; struct rte_mbuf *m; uint16_t i; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG int ret; #endif @@ -2196,7 +2196,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts, break; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 11723778f..b5b169ff7 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -704,7 +704,7 @@ rte_pmd_softnic_manage(uint16_t port_id) struct rte_eth_dev *dev = &rte_eth_devices[port_id]; struct pmd_internals *softnic; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); #endif diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c index d610b1617..2f7c3a838 100644 --- a/drivers/net/softnic/rte_eth_softnic_thread.c +++ b/drivers/net/softnic/rte_eth_softnic_thread.c @@ -3093,7 +3093,7 @@ rte_pmd_softnic_run(uint16_t port_id) { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); #endif diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 752faa0f6..02eaf38e3 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1979,7 +1979,7 @@ virtio_xmit_pkts_prepare(void *tx_queue __rte_unused, struct rte_mbuf **tx_pkts, for (nb_tx = 0; nb_tx < nb_pkts; nb_tx++) { struct rte_mbuf *m = tx_pkts[nb_tx]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG error = rte_validate_tx_offload(m); if (unlikely(error)) { rte_errno = -error; diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index dd99684be..a801290ff 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -373,7 +373,7 @@ vmxnet3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG ret = rte_validate_tx_offload(m); if (ret != 0) { rte_errno = -ret; diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index e9e3a1699..f314b57c7 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -4375,7 +4375,7 @@ rte_eth_rx_burst(uint16_t port_id, uint16_t queue_id, struct rte_eth_dev *dev = &rte_eth_devices[port_id]; uint16_t nb_rx; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); RTE_FUNC_PTR_OR_ERR_RET(*dev->rx_pkt_burst, 0); @@ -4498,11 +4498,11 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id, struct rte_eth_dev *dev; void *rxq; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); #endif dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (queue_id >= dev->data->nb_rx_queues) return -ENODEV; #endif @@ -4555,11 +4555,11 @@ static inline int rte_eth_tx_descriptor_status(uint16_t port_id, struct rte_eth_dev *dev; void *txq; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); #endif dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (queue_id >= dev->data->nb_tx_queues) return -ENODEV; #endif @@ -4641,7 +4641,7 @@ rte_eth_tx_burst(uint16_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, 0); RTE_FUNC_PTR_OR_ERR_RET(*dev->tx_pkt_burst, 0); @@ -4727,7 +4727,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, { struct rte_eth_dev *dev; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (!rte_eth_dev_is_valid_port(port_id)) { RTE_ETHDEV_LOG(ERR, "Invalid TX port_id=%u\n", port_id); rte_errno = EINVAL; @@ -4737,7 +4737,7 @@ rte_eth_tx_prepare(uint16_t port_id, uint16_t queue_id, dev = &rte_eth_devices[port_id]; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG if (queue_id >= dev->data->nb_tx_queues) { RTE_ETHDEV_LOG(ERR, "Invalid TX queue_id=%u\n", queue_id); rte_errno = EINVAL; diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h index 1560ecfa4..9a9732189 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -120,7 +120,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) struct rte_udp_hdr *udp_hdr; uint64_t inner_l3_offset = m->l2_len; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG /* * Does packet set any of available offloads? * Mainly it is required to avoid fragmented headers check if @@ -133,7 +133,7 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) if (ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6)) inner_l3_offset += m->outer_l2_len + m->outer_l3_len; -#ifdef RTE_LIBRTE_ETHDEV_DEBUG +#ifdef RTE_DEBUG /* * Check if headers are fragmented. * The check could be less strict depending on which offloads are -- 2.17.1