From patchwork Wed Mar 2 23:34:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Sune X-Patchwork-Id: 11004 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 79C192986; Thu, 3 Mar 2016 00:34:43 +0100 (CET) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 6BCA71C52 for ; Thu, 3 Mar 2016 00:34:42 +0100 (CET) Received: by mail-wm0-f43.google.com with SMTP id l68so108250532wml.0 for ; Wed, 02 Mar 2016 15:34:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=c3bRusubkT2WC/7PjEQ1fwwpn6apU28KLDUfeke+x5o=; b=nvFQ7APzLARaVjj/Jrp3LUkbKJubUBRIQ9D7j6YnJM+50FkQ2X3mlZxg8xl5XrM1+L qJ8bmXn/qDzCuOlaywC0DgbcxJenftaUwDkdVj24z5wgVUKhRLg8VY6TEN/F1BKqZrw2 NkE9ofrcqpzrG9BGlVlPQNPnYJgdR4cEhk7uYuMIGFc8G5TLyg3UszJ77mudhYUILRcl uO9eD7V/K1u2+dXH2AdfnnmYwWZpa56KR5we5QfXoAm0gGsOHQ+2yaY1aKK+6UIJdM1Q byMKuApEX+6PNJyohzYiETMfGc9vnfkGSbRHJa/vJLbTCGO0/3mlf1RPBnDnrEMqsJ9N CNCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=c3bRusubkT2WC/7PjEQ1fwwpn6apU28KLDUfeke+x5o=; b=gxDxkRkMOSBokPh4usMxYA9axmA0A1BYPsr1YRckPYR5HoBz0c5ceubRPXFDnI3PZL bNL4sEYQP3QTCDnjqDW4PwwSR3TzjQPhFvo1GhT+dd39NfwHtprs5Szt12uyFWt1ktCT goRRNzgp3hu2UM926SjPnxL9dsS6dvmigh0iCb/RG31LEmX9xjfrgH+uyiStLcU3Hjdm wPmAUKPmwCAu3CRMfnz+Z8VeTRTCQgjcskDw7xEw6Ji0LO3B9mUgpKWE2D0GyG309UM8 XAox+acJPn7U676Z580iAfgVgH0xp6B9x7Fjva6BbQ+OEmgW0rx9VHVviVqU+XTVJ2+5 YyGA== X-Gm-Message-State: AD7BkJKJTV1kzqSMdCMSkDfmIGh8luEk43MJGUmfDXDLjI7tvEfdLQpn0htHBTI3JlcegA== X-Received: by 10.28.131.141 with SMTP id f135mr2334509wmd.33.1456961682281; Wed, 02 Mar 2016 15:34:42 -0800 (PST) Received: from localhost.localdomain (182.Red-81-37-213.dynamicIP.rima-tde.net. [81.37.213.182]) by smtp.gmail.com with ESMTPSA id ys9sm37907133wjc.35.2016.03.02.15.34.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 15:34:41 -0800 (PST) From: Marc Sune To: dev@dpdk.org Date: Thu, 3 Mar 2016 00:34:37 +0100 Message-Id: <1456961677-1116-1-git-send-email-marcdevel@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH] cryptodev: fix RTE_PMD_DEBUG_TRACE redefinition X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" RTE_PMD_DEBUG_TRACE used RTE_FUNC_PTR_OR_ERR_RET was redefined in rte_cryptodev_pmd.h which produced MACRO redefinition warnings when including both rte_cryptodev_pmd.h and rte_ethdev.h. This commit moves MACRO definition to rte_cryptodev.c to prevent this warning. --- lib/librte_cryptodev/rte_cryptodev.c | 7 +++++++ lib/librte_cryptodev/rte_cryptodev_pmd.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c index 2838852..90d2c30 100644 --- a/lib/librte_cryptodev/rte_cryptodev.c +++ b/lib/librte_cryptodev/rte_cryptodev.c @@ -71,6 +71,13 @@ #include "rte_cryptodev.h" #include "rte_cryptodev_pmd.h" +#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG +#define RTE_PMD_DEBUG_TRACE(...) \ + rte_pmd_debug_trace(__func__, __VA_ARGS__) +#else +#define RTE_PMD_DEBUG_TRACE(fmt, args...) +#endif + struct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS]; struct rte_cryptodev *rte_cryptodevs = &rte_crypto_devices[0]; diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index 8270afa..c43680f 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -62,13 +62,6 @@ struct rte_cryptodev_qp_conf; enum rte_cryptodev_event_type; -#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG -#define RTE_PMD_DEBUG_TRACE(...) \ - rte_pmd_debug_trace(__func__, __VA_ARGS__) -#else -#define RTE_PMD_DEBUG_TRACE(fmt, args...) -#endif - struct rte_cryptodev_session { struct { uint8_t dev_id;