From patchwork Fri Nov 3 14:00:10 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: 117902 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp3354691edm; Fri, 3 Nov 2017 07:04:27 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QFxHv2qaXTSiDGmd511bA+XBM5hdaaOhZXIf18VSVELDn/2ETMne9OSHYMk/S6/8+XawCW X-Received: by 10.55.0.136 with SMTP id t8mr9991439qkg.286.1509717866998; Fri, 03 Nov 2017 07:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509717866; cv=none; d=google.com; s=arc-20160816; b=P+kN4qy5/YBAH8pQmAQx8TWw6V/5FITvr/cmwj6nqu9kxt9h+enzQkt+XDgwS2U3NL Zs5fM0yheUmOp375IopQF3cRIEWpzmZr1dQM96+qNU8SucapV5IIMSzgD//yeLQVRKdd lS50eJYsSejfsEIx0NuLZ43ouoc7K2WUXr2cKZm52AlQRiINAS7/MCz9RKehJzD4HZk0 X1Qc6IzgVfe/9Tq2sOQwf/n72f3Lo2q6aGHQd5uMly4dNo76925Wj9RwvNaaFhLA3sW7 OyJwiMU+n/FCAHdrjuQxzhqyHCcPgvOy5IHw05d9iX8o0OwLxI7i2yKRaqMOO1Xkcp7y IwCw== 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=IblQclPWEwbfxLYZwSNSM4P2EyrB0croFPhq9myAmeg=; b=UYL1+OjD8t9sCnnJ8G7LlBPxl5L2J+1X8nCrlVIneusyNrXUaJ3QPuUOgCo4FG3BtQ AL/u8jlxPDYvT2TC57hJhucYKPVdx05FPYcuvQXRTPfkNpQ46nx9FgOnRvBt0/4YYnzK HGu7iQI0YZScHzJGdssChzXuVfG98ybvveiioGFIbT00PUXf7q8s43ldKlkp3Zwtco19 MAzY7odqXy5wgKxCW8uM4pFZtYoNo8pNjMURkMh6l6K9MG0VPS2+hJbvl7RF/B0+0H/u O5v1qL6Pto+20u7HljWf9zsZtOTSUN9qo42Jgoxia4LOrNWpeOBzVlfTXK3qM9M6xW3a eoEw== 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 d79si5559342qkc.32.2017.11.03.07.04.26; Fri, 03 Nov 2017 07:04:26 -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 A3B196104A; Fri, 3 Nov 2017 14:04:26 +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 9719D61018; Fri, 3 Nov 2017 14:01:45 +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 81A0E61018; Fri, 3 Nov 2017 14:01:43 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id D08E560389 for ; Fri, 3 Nov 2017 14:00:22 +0000 (UTC) Received: from mxback7j.mail.yandex.net (mxback7j.mail.yandex.net [IPv6:2a02:6b8:0:1619::110]) by forward105o.mail.yandex.net (Yandex) with ESMTP id DA63544411D7 for ; Fri, 3 Nov 2017 17:00:13 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback7j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id X1958SwXQM-0D2Gs8Ox; Fri, 03 Nov 2017 17:00:13 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id CD6rRlXE3k-0DYiEG2n; Fri, 03 Nov 2017 17:00:13 +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: Fri, 3 Nov 2017 17:00:10 +0300 Message-Id: <1509717611-13444-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509717611-13444-1-git-send-email-odpbot@yandex.ru> References: <1509717611-13444-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 273 Subject: [lng-odp] [PATCH API-NEXT v1 2/3] 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: e0d94080baa0c37e77bf42dc261565b3b19571d8 **/ 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 */