From patchwork Thu Jan 25 08:00:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125772 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp943307ljf; Thu, 25 Jan 2018 00:00:56 -0800 (PST) X-Google-Smtp-Source: AH8x227Eu1oVqrSrlbu8RdJtq6STILVa9fnbnjwkXSeIJER1sykB3GqAFPiYA2/NGpYDAWrdnMne X-Received: by 10.55.96.4 with SMTP id u4mr12796354qkb.323.1516867256617; Thu, 25 Jan 2018 00:00:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516867256; cv=none; d=google.com; s=arc-20160816; b=XZMGaDEcwYf0TeAj02zYPcTjHqB4ulkcLhI/zQvfnIDSVC6vWy6L2ec838NNtEWYH9 tMJ5kbjGqGWtAPg0TdMR9k/n23C67hsdTKdr1Z3+30ml/azdy76yr1Fipl38HrxSl3C0 dj5jUyi/uYMyAmLkmxH9bwXbzKfiS5/Of6469+MdWtOBpbzXnRLnbBIZ/Ft4Coe+A+7L cMIZtNvpv+3QgKJBrKvYBuDX4d+q1EF6ZY6QzljhgwSRekh8/oHsuRCjNqsJT7HtQFA9 4K/UK1sWn7L/qaA6HA5Ty5KEQGCm6vgpJrnSM+4TuBurniZ53Nroi5/LfRmjKSH66cn3 piQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=LbGlnahgjPpJ1sK81YC6E45w3rAyyNa2/udaHvJgT80=; b=iC/HV+POGAFVNhwidS1ayHN/1tLLraOEHrKjo59nSayLrCqUzf4yTR1s7vWlmLCwxW o8VE4OaFWN9sd2pDSHwut5hjw4eHFJ4wwOqBfmAfMRFxNNHpaBbXeQVgaWxwzQu2mfYb +vPv4nuUXDIRHXyxtvSW//N7swASyXVqftp0vQSpj56WyU+p7nsuw9KuJNqQU2Bxekkb JNNadem/WWoJ37yYisHaJW+TuEzt5w0vHQdL4nbH/Ib3yPK8leTRBTP1JcoHUyICsILF vtRW9nnsmYsrSvFmHQejzRDGWKsAV4/NLQrE5TdJE1vg6wR/Mrr7MUUV3FqCwqj6rNom jgYg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w27si4690489qtk.368.2018.01.25.00.00.55; Thu, 25 Jan 2018 00:00:56 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id D989A617A1; Thu, 25 Jan 2018 08:00:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 537F0616F1; Thu, 25 Jan 2018 08:00:39 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 48C146178D; Thu, 25 Jan 2018 08:00:34 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 904F66179A for ; Thu, 25 Jan 2018 08:00:17 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 1F6E4510266C for ; Thu, 25 Jan 2018 11:00:16 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id lAG2U2CDVk-0GFevxfa; Thu, 25 Jan 2018 11:00:16 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id HyRzbFHzjS-0F901U4O; Thu, 25 Jan 2018 11:00:15 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 25 Jan 2018 11:00:11 +0300 Message-Id: <1516867212-18991-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516867212-18991-1-git-send-email-odpbot@yandex.ru> References: <1516867212-18991-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 408 Subject: [lng-odp] [PATCH CATERPILLAR v4 2/3] linux-gen: pktio: renamve ODP_MDEV into _ODP_MDEV X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Mykyta Iziumtsev ODP_ and odp_ prefixes are reserved for OpenDataPlane APIs. Signed-off-by: Mykyta Iziumtsev --- /** Email created from pull request 408 (MykytaI:caterpillar_mdev_e1000e) ** https://github.com/Linaro/odp/pull/408 ** Patch: https://github.com/Linaro/odp/pull/408.patch ** Base sha: f87bb5146fb25f7cd62246500cb4f7e625375654 ** Merge commit sha: 9ab7ecd5f9b053b699caa643dd1de3bbe19c850d **/ platform/linux-generic/m4/odp_mdev.m4 | 2 +- platform/linux-generic/pktio/mdev.c | 4 ++-- platform/linux-generic/pktio/mdev/cxgb4.c | 4 ++-- platform/linux-generic/pktio/mdev/i40e.c | 4 ++-- platform/linux-generic/pktio/subsystem.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/linux-generic/m4/odp_mdev.m4 b/platform/linux-generic/m4/odp_mdev.m4 index 64f9e0969..f424418ed 100644 --- a/platform/linux-generic/m4/odp_mdev.m4 +++ b/platform/linux-generic/m4/odp_mdev.m4 @@ -19,7 +19,7 @@ CPPFLAGS="$MDEV_CPPFLAGS $CPPFLAGS" ########################################################################## if test x$mdev_support = xyes then - AC_DEFINE([ODP_MDEV], [1], + AC_DEFINE([_ODP_MDEV], [1], [Define to 1 to enable mediated device drivers support]) AC_SUBST([MDEV_CPPFLAGS]) else diff --git a/platform/linux-generic/pktio/mdev.c b/platform/linux-generic/pktio/mdev.c index e3917146f..3353e416b 100644 --- a/platform/linux-generic/pktio/mdev.c +++ b/platform/linux-generic/pktio/mdev.c @@ -6,7 +6,7 @@ #include "config.h" -#if defined(ODP_MDEV) && ODP_MDEV == 1 +#if defined(_ODP_MDEV) && _ODP_MDEV == 1 #include #include @@ -590,4 +590,4 @@ void mdev_device_destroy(mdev_device_t *mdev) munmap(mdev->mappings[i].addr, mdev->mappings[i].size); } -#endif /* ODP_MDEV */ +#endif /* _ODP_MDEV */ diff --git a/platform/linux-generic/pktio/mdev/cxgb4.c b/platform/linux-generic/pktio/mdev/cxgb4.c index 5c55d87a4..9088eca96 100644 --- a/platform/linux-generic/pktio/mdev/cxgb4.c +++ b/platform/linux-generic/pktio/mdev/cxgb4.c @@ -6,7 +6,7 @@ #include "config.h" -#if defined(ODP_MDEV) && ODP_MDEV == 1 +#if defined(_ODP_MDEV) && _ODP_MDEV == 1 #include #include @@ -890,4 +890,4 @@ ODP_MODULE_CONSTRUCTOR(cxgb4_module_init) */ int enable_link_cxgb4_pktio_ops; -#endif /* ODP_MDEV */ +#endif /* _ODP_MDEV */ diff --git a/platform/linux-generic/pktio/mdev/i40e.c b/platform/linux-generic/pktio/mdev/i40e.c index f2be2bcf3..25d91581e 100644 --- a/platform/linux-generic/pktio/mdev/i40e.c +++ b/platform/linux-generic/pktio/mdev/i40e.c @@ -6,7 +6,7 @@ #include "config.h" -#if defined(ODP_MDEV) && ODP_MDEV == 1 +#if defined(_ODP_MDEV) && _ODP_MDEV == 1 #include #include @@ -640,4 +640,4 @@ ODP_MODULE_CONSTRUCTOR(netmap_pktio_ops) */ int enable_link_i40e_pktio_ops; -#endif /* ODP_MDEV */ +#endif /* _ODP_MDEV */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 199ed83fb..fe4f6df6f 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -44,7 +44,7 @@ extern int enable_link_socket_mmap_pktio_ops; #if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1 extern int enable_link_tap_pktio_ops; #endif -#if defined(ODP_MDEV) && ODP_MDEV == 1 +#if defined(_ODP_MDEV) && _ODP_MDEV == 1 extern int enable_link_cxgb4_pktio_ops; extern int enable_link_i40e_pktio_ops; #endif @@ -77,7 +77,7 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #if defined(ODP_PKTIO_TAP) && ODP_PKTIO_TAP == 1 enable_link_tap_pktio_ops = 1; #endif -#if defined(ODP_MDEV) && ODP_MDEV == 1 +#if defined(_ODP_MDEV) && _ODP_MDEV == 1 enable_link_cxgb4_pktio_ops = 1; enable_link_i40e_pktio_ops = 1; #endif