From patchwork Thu Nov 9 12: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: 118435 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp6500404qgn; Thu, 9 Nov 2017 04:03:28 -0800 (PST) X-Google-Smtp-Source: AGs4zMbeOeoxHsomcQncy5sH1YDPGeYqgJ3Bt1R5lY+lMNYZxUQjx8Ftyvl6DpOWyAOFsyRYvxhI X-Received: by 10.55.137.198 with SMTP id l189mr323145qkd.169.1510229007996; Thu, 09 Nov 2017 04:03:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510229007; cv=none; d=google.com; s=arc-20160816; b=di4x878P0r6k4gpz9VIQszytlDJm521Esb8qACXs47GVHsOaVsZsCyH8k0raJ1uFW6 VqXmiowwva2te9FJKCiASFRgyj0OJvZW10kyZ0FwWyKGvxz+lalOBxra5r894W2puzvA 6j1sH5OotkT2Go8z6MlTa3bBtmKILvG5LWcEA5by8khZSpJ6CgKYYAjCgtJAuEc23T8g ANeoohIaarlNycKq5K4UVrTGHoqin+9lG/0RAAPxpWbGNDISOtPXQkgin6hibsbGEsyd R0DVZEwNa7mcIPf29UUy/FfsdL+55oo1L8O/YzboWBoOUk4YIcRRcG383e3HS754v2ah piYg== 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=I1YBZEcKu8hmNApzSGpBffUrXBYfQGw61qHVY696gDs=; b=B3oiwgw2vjbzWzh2TPYHTHQOaN82P/mmZ7lJXcySeoIWDLCY67d62Sx9787LLR8qJw qBinFlJ1ihxdPiqVH2p6Wc2sIKD25HRUhWRo30Za/hVKEH8WiGAcGEeGL8fF4Xhv7DWC JnqkIpthBFS7zDQJ7D5+hEDfCzq6rFnuO4TwPlOGWQpwDiokDP1N5E3K1b8z5+/z3sXJ TUeI6/qCDF1Qm8W9PMX2WLl7jEkrQ4VV1Cd0Zwz62r/+iacsPW8bXWFlpubWgd+t/Gu7 Ly4qHFsZ46yRSy2rsJVHMCuX29hFgdgc7/pdRq0vL3RoGWSH+dVeH4UN4obrCdXC9fWU ti7g== 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 x204si6060232qka.135.2017.11.09.04.03.27; Thu, 09 Nov 2017 04:03:27 -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 954DD60E25; Thu, 9 Nov 2017 12:03:27 +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 BBBFA60C1C; Thu, 9 Nov 2017 12:02:31 +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 A471960C18; Thu, 9 Nov 2017 12:02:12 +0000 (UTC) Received: from forward103o.mail.yandex.net (forward103o.mail.yandex.net [37.140.190.177]) by lists.linaro.org (Postfix) with ESMTPS id DED8B60FFF for ; Thu, 9 Nov 2017 12:00:20 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 3E719588569C for ; Thu, 9 Nov 2017 15:00:19 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Q5vgiyMxq3-0JLCJvYo; Thu, 09 Nov 2017 15:00:19 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id bxb2c43GJ0-0IiqkMGW; Thu, 09 Nov 2017 15:00:18 +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, 9 Nov 2017 15:00:10 +0300 Message-Id: <1510228814-21692-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510228814-21692-1-git-send-email-odpbot@yandex.ru> References: <1510228814-21692-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 273 Subject: [lng-odp] [PATCH API-NEXT v5 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: 5ed52232b041f855c0e109143480b16ea467c7da **/ 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 */