From patchwork Thu Nov 9 11:00:09 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: 118425 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp775191edl; Thu, 9 Nov 2017 03:01:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMaJdT5Hx7eU/ypDCl3wjY/M/ScSU9MeFqeRPN+fhMl3+QSWzMOc9TmMhLk1nRs3NIpW8mt0 X-Received: by 10.200.39.179 with SMTP id w48mr95174qtw.314.1510225293284; Thu, 09 Nov 2017 03:01:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510225293; cv=none; d=google.com; s=arc-20160816; b=Bcf6sl0ec4cv5WvLL444vLYLIZjF7CDn3eW9keaMA1ZGamC2c5McAMF0KWdbZhY37z Jo2XW8SABhX39jMaT3G8M4w0FKxSdF784zK5luV3DaW6I7HFM4KEVIfVu8E6tKlNYMYL UUDIPpLt2pYNNCg3miTufrQn7eosY+IAZJD/wz0mydwrgCo7ewq3x6Ah4QxKPNMVo8na hbqhqN7QPzPiUz2R6vsqkJgEKuNE0EEYfF+9hI4cAoA3cTrF9aJu/dtZbFCITkj14Wm2 Tq6sXBfY+uDnAwn9JNRi9pTcSQ3pWiSXly3Ts47rkgz+/iieQnIx3KHHL/7T9lCYaUU/ pYFA== 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=fAR91I2BFfk7XJ01yR6pyrMUvWpCZdCtDRZaPxGR2vM=; b=A7raXaS/5dFySlAFRitnaA6t8k/gcIYV9880Ufmz1gvfMjB7W2Lz0+YG1F5UOHjDYv MfuSSdUPNs24e9JFys5X9l3M3JyKYQfIgWnR9ecPIIwGckHp7RnCgMIolfp25unhtPYz qzLiOL6N1jewAYtvZDpwg4z0jylRhNRpYt2Ra6Ymm93Gdhfhf51Bx/eze+4WmEsySNWF E/x1UX/9eU2qpcNQWspGWUHEhFfUOAAaU9pweSxMV0WL/bFAx6HV5O8qa4+sMzpN30Ij ho0k2znGFMAA8KWBRPZ5STLHXIyw3/lc/1AAYdG2qeM6CYfWconeJDybM28DjMyvFmBa WNpg== 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 m123si5749138qkf.78.2017.11.09.03.01.31; Thu, 09 Nov 2017 03:01:33 -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 6EBAC60C18; Thu, 9 Nov 2017 11:01:31 +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 2560260C71; Thu, 9 Nov 2017 11:00:32 +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 8217260C36; Thu, 9 Nov 2017 11:00:23 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 0D8D36038E for ; Thu, 9 Nov 2017 11:00:18 +0000 (UTC) Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward105o.mail.yandex.net (Yandex) with ESMTP id ED574444426B for ; Thu, 9 Nov 2017 14:00:15 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SU5frAMgp3-0FR0bCMQ; Thu, 09 Nov 2017 14:00:15 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OkOZyJOXa3-0FYSwYfW; Thu, 09 Nov 2017 14: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, 9 Nov 2017 14:00:09 +0300 Message-Id: <1510225213-20407-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510225213-20407-1-git-send-email-odpbot@yandex.ru> References: <1510225213-20407-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 273 Subject: [lng-odp] [PATCH API-NEXT v4 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: 0724c6474bb6db484fdbdbb1b14035a33ba9525d **/ 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 */