From patchwork Wed Nov 8 14:00:18 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: 118267 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5339787qgn; Wed, 8 Nov 2017 06:12:09 -0800 (PST) X-Google-Smtp-Source: AGs4zMahrkIuYUpj0fY6jKqzlGQpTGp7k8Wz0b8doCfQ1ssV0f7BndKL2jxAFDjhjPfvwxUZx8Jq X-Received: by 10.55.106.132 with SMTP id f126mr878565qkc.295.1510150329882; Wed, 08 Nov 2017 06:12:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510150329; cv=none; d=google.com; s=arc-20160816; b=CgVhlXF9a3wH6kOsb04+nj8T1mIxCg4M6dGMnXbJhApM4l9+ej+e+6s0JSSsAI8Chf 8t2g5ZH3JXZDgOE+bSE7JvSiBhFFoyNKJZ811omaZHhIJAd8Kc3WXKsdAot80splR7fT KkJKvDZNIpqpWGE+uQowgvfwkgRKe8UdAj9IxR2h+XtARiQ/duR0EMMiYfILlIJ+s3OC YhUYxdMELO3cExRwxK+T7Ft1whBNEkKonnKQK97Ng32vLuAMJitb8VYSq+4K6lzOJzn6 0l3ZMr/xGJw1rYBP9qWQapJk7UdELMdNZDrAJsGswZWdzO5il4EJSRjYs2xMBSbg7hT/ I6wQ== 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=K09LeGF9W6VFaOoUleQzTwrRlypNZmOLg7v6H2+SGYY=; b=afQWDerku9El8xaq+cJfVXsCbNtxkVeo5Q7JuVwfweMX+2Q4akjsWPVTlZOi8jxplO l2npGg25iC5M7wrZzSPHoE5uCw3W74lBQPE/JjhnvvgKM8un0phZqzlu0giNXIpB8zky EswWLaKLm7foIyPtwBFayxIHIRD3Ll/B/xTK5vUqjKv3bVXKzS7nvHoqpJNtSQoScw8v dTZPlTOfkhaeDkH1Kl/WJgDQPQ9ph69dV3XIs89BD/jnBE+TnYmHDeNUpMv2gR3IMMuN RogzqZ/HnmYFE9/Z9R8UB97VfXGjtUaE2bRJMGEwD913o1HPFhWBcofkxU2gvZcrr4xS DV1A== 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 g136si2613102qkg.209.2017.11.08.06.12.09; Wed, 08 Nov 2017 06:12:09 -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 5A8EA61005; Wed, 8 Nov 2017 14:12:09 +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_H3,RCVD_IN_MSPIKE_WL,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 CB7AC60C2E; Wed, 8 Nov 2017 14:03:24 +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 CB83E60CDF; Wed, 8 Nov 2017 14:03:16 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 8E94760C27 for ; Wed, 8 Nov 2017 14:00:36 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 947004302F4F for ; Wed, 8 Nov 2017 17:00:30 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 4kjYrG5MCJ-0Ub4ReSg; Wed, 08 Nov 2017 17:00:30 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ABVIw2d5cZ-0U1e6hx9; Wed, 08 Nov 2017 17:00:30 +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: Wed, 8 Nov 2017 17:00:18 +0300 Message-Id: <1510149622-31536-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510149622-31536-1-git-send-email-odpbot@yandex.ru> References: <1510149622-31536-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 273 Subject: [lng-odp] [PATCH API-NEXT v2 2/6] api: pktio: use common protocol layer enum 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: Petri Savolainen Use common values between pktio parser layer and packet protocol layer enums. Signed-off-by: Petri Savolainen --- /** Email created from pull request 273 (psavol:next-packet-parse) ** https://github.com/Linaro/odp/pull/273 ** Patch: https://github.com/Linaro/odp/pull/273.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: 80af43ecfb926cbcf7f13ae5f91653aaee11ebf3 **/ include/odp/api/spec/packet_io.h | 11 ++++++----- platform/linux-generic/include/odp/api/plat/packet_inlines.h | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index 52af646a6..6e4f88100 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -23,6 +23,7 @@ extern "C" { #include #include #include +#include /** @defgroup odp_packet_io ODP PACKET IO * Operations on a packet Input/Output interface. @@ -381,19 +382,19 @@ typedef union odp_pktout_config_opt_t { */ typedef enum odp_pktio_parser_layer_t { /** No layers */ - ODP_PKTIO_PARSER_LAYER_NONE = 0, + ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE, /** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */ - ODP_PKTIO_PARSER_LAYER_L2, + ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2, /** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */ - ODP_PKTIO_PARSER_LAYER_L3, + ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3, /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_PKTIO_PARSER_LAYER_L4, + ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4, /** All layers */ - ODP_PKTIO_PARSER_LAYER_ALL + ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL } odp_pktio_parser_layer_t; diff --git a/platform/linux-generic/include/odp/api/plat/packet_inlines.h b/platform/linux-generic/include/odp/api/plat/packet_inlines.h index 1804fa6f2..22f5aca31 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inlines.h @@ -15,7 +15,9 @@ #include #include -#include +#include +#include +#include #include /** @internal Inline function offsets */