From patchwork Tue Oct 24 15:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116952 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5912100qgn; Tue, 24 Oct 2017 08:05:09 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SUGuRe0VQqPqR1ZKd9tevA8GiLQe5pPd2XZSf3d+3/+vaH8LMOhoUOu6pCZqQfNoQWrXFb X-Received: by 10.200.17.146 with SMTP id d18mr25388767qtj.61.1508857509096; Tue, 24 Oct 2017 08:05:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857509; cv=none; d=google.com; s=arc-20160816; b=AIX+RCWBNrtEbdo3VSbizqEmrTDf7Ix9EZVyNiSviH0ufpXfo8hXXPJFPKWnLvnL1I 6e3qfaeVH+obcxcFhQfasaQTRHs7MI24GFTdGTpKwOgWuTJgoFATnZu9yL9gKAMXHFfL +eKyixhgdWGvascpn98lAV3NmX4RVSOFduR5DDkSM5j2RMqjo8x8JaXzKOSxi1HVVoLr ICH1gJszacaPTdm4UJtIt1FJ5VS3fxzYm5d7V5ZYJotvvk91SQQlEZjI2yam6yXJRK1w evph1f1hXhSWtgUv1aPrPndNHSp8AsjY5S+5IyxvnnMIjZGwcfFjaDapbc43zjm8AanH 90Xw== 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=Za8Fo6aGoVoQ7Q7wPL9Ih0CBuwpXh5fs0SKyVDyllFc=; b=ZiMmpz/bsKcqNzeFNh08H/aIvqTDqkvAISUtr0IkEPYMK3oKRstjWNP0vZhq5+74QG uaHka/OkIoG/1mL1vWW5yiIco6QcMZh2tiAU2bPFymYI62+4apvQGvhdTcg7RPUsOyty DyJEBxVnjbUeDEhHQkiJL88T+fs7NQw4BSLRKM3bjpOo4lmvtKBCvfIGg/eWiMesl3Ed ONxA99EL14IPHPKzjMa4a71Nw0M0XBlTJxsKdQCulKm8wepfSaFJNMb4NCeGlpgNl87o YQCZqpJKwTsEpXy6qj0OdV656pyUOAaj59P+xbgJ6GJW5oe0p9a29Mt198qMqPLVAA4f /LCg== 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 z60si380496qtc.470.2017.10.24.08.05.08; Tue, 24 Oct 2017 08:05:09 -0700 (PDT) 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 A31DD61633; Tue, 24 Oct 2017 15:05:08 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED 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 BB64362939; Tue, 24 Oct 2017 15:01:09 +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 D681D615AC; Tue, 24 Oct 2017 15:00:46 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 0645C618C8 for ; Tue, 24 Oct 2017 15:00:37 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward102o.mail.yandex.net (Yandex) with ESMTP id BCFE05A0632A for ; Tue, 24 Oct 2017 18:00:35 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id pOodvxoLmO-0ZgCLacD; Tue, 24 Oct 2017 18:00:35 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0ZPaBMp5; Tue, 24 Oct 2017 18:00:35 +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: Tue, 24 Oct 2017 18:00:04 +0300 Message-Id: <1508857207-23099-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 3/6] linux-gen: pktio: tap: build TAP pktio based on configuration option 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: Bogdan Pricope Build TAP pktio based on configuration option Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ platform/linux-generic/m4/configure.m4 | 3 +++ platform/linux-generic/pktio/subsystem.c | 4 ++++ platform/linux-generic/pktio/tap.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 9c35a9962..2cc16a045 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -94,3 +94,6 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile ########################################################################## AC_DEFINE([ODP_PKTIO_IPC], [1], [Define to 1 to enable IPC packet I/O support]) + +AC_DEFINE([ODP_PKTIO_TAP], [1], + [Define to 1 to enable TAP packet I/O support]) diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 2ad856247..76b8a9283 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -35,7 +35,9 @@ extern int enable_link_pcap_pktio_ops; #endif extern int enable_link_socket_pktio_ops; extern int enable_link_socket_mmap_pktio_ops; +#ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; +#endif ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) { @@ -58,5 +60,7 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #endif enable_link_socket_pktio_ops = 1; enable_link_socket_mmap_pktio_ops = 1; +#ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1; +#endif } diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index e256eec3e..fffc4c82f 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -6,6 +6,8 @@ #include "config.h" +#ifdef ODP_PKTIO_TAP + /** * @file * @@ -423,3 +425,5 @@ ODP_MODULE_CONSTRUCTOR(tap_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_tap_pktio_ops = 0; + +#endif /* ODP_PKTIO_TAP */