From patchwork Wed Dec 13 15:00:13 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: 121778 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5592289qgn; Wed, 13 Dec 2017 07:09:26 -0800 (PST) X-Google-Smtp-Source: ACJfBosAT6tKjT0JoziJb5ZdEvCEw443s6Ua1XpcBYz3pnGXV2D7zIiyvQnwOEcU+AgQw2rS94Il X-Received: by 10.200.25.78 with SMTP id g14mr11477277qtk.119.1513177766584; Wed, 13 Dec 2017 07:09:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513177766; cv=none; d=google.com; s=arc-20160816; b=IC+2aPm8078RfCLnPrdURqJ1+K5e9FhRAAwr68MbeDXgWSV4Oh7SitcxSAnnrbNcbc 4dYv8ECo2YdUSKJwmXMqfb+ptfmVbIliVZhfzj2onj9w4CAsarNGOW+ExXnh1B/1rggx nBt6uassrFb16x0fHOJjlecy+ugPkY1v85oWTmX/jKHPWaxWz3Wnk0Fns4Ux9zUw0CdQ fmRlg2mnl/v8uV4mzYW+nV+jAldR5ZIBSTLIlUZfYgZk3AymDuxEcgrEQVwNpbNvzZSc gvSgcTtvgT2OQqUzRrjuhRT2n37y0iJrMi1ubUH+Ve1UoWhiD/l9ZgHf6x+6ATdtINBA Pg6A== 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=5AsxTL3Ccs28RDXdfTcKAWQD1k0BlK2OSjoAelUR1YM=; b=J0MWwiQIFF9dl6JPT00JXB7kCNQU5/Ucohh0E0Rbci7rjG3CcSy3V27YP4KSTvJfXB 0UlqX+mPy3zywL6ap6a6gv3Y/vaTnpJdFTkrmMdbyeqIwVqPQZhYMNqSd/HKwNeXzKIQ hFu7GEbd5s+5Fw9IbMaEVZyq/KwFWp0neE1wAEtJ/2CP8uZfFaTLT18zcrBFjbNJzjs4 A9kc+RGT9k8jwFP6s7lnDgMSgQ1nx+Xif5vBBR0p7nygd8ekQIbWF5CnodUgs10Fc1mr 8nt8mkeC7HHGMZ1L8vT62is2LKtg2yn+kziRFcuW9yts4G6DlfZf9yf5wzHegjIY2fGi P7ow== 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 w41si2043020qtc.53.2017.12.13.07.09.26; Wed, 13 Dec 2017 07:09:26 -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 2A6C460888; Wed, 13 Dec 2017 15:09: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=-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 AD39860800; Wed, 13 Dec 2017 15:01:44 +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 508F260925; Wed, 13 Dec 2017 15:01:26 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id F11EF607FB for ; Wed, 13 Dec 2017 15:00:20 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 71EF813467F0 for ; Wed, 13 Dec 2017 18:00:19 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7ODP3P5lrE-0JVK1ewl; Wed, 13 Dec 2017 18:00:19 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id TIlNgphY6V-0IwCu1dq; Wed, 13 Dec 2017 18: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: Wed, 13 Dec 2017 18:00:13 +0300 Message-Id: <1513177217-8215-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> References: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v2 1/5] api: pktio: start switching to using odp_proto_layer_t 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: Dmitry Eremin-Solenikov Instead of using separate odp_pktio_parser_layer_t switch to using odp_proto_layer_t. Deprecate old enum and values. For now do not put them under ODP_DEPRECATED_API to let the rest of ODP code to adapt. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 7427c77cd44f5de84a2788e6d7d0cefaf146f479 **/ include/odp/api/spec/packet_io.h | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index a3312d280..bf30877f5 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -272,8 +272,8 @@ typedef struct odp_pktio_param_t { * not checked. * * IPv4 checksum checking may be enabled only when parsing level is - * ODP_PKTIO_PARSER_LAYER_L3 or higher. Similarly, L4 level checksum checking - * may be enabled only with parsing level ODP_PKTIO_PARSER_LAYER_L4 or higher. + * ODP_PROTO_LAYER_L3 or higher. Similarly, L4 level checksum checking + * may be enabled only with parsing level ODP_PROTO_LAYER_L4 or higher. * * Whether checksum checking was done and whether a checksum was correct * can be queried for each received packet with odp_packet_l3_chksum_status() @@ -405,24 +405,30 @@ typedef union odp_pktout_config_opt_t { /** * Parser layers + * + * @deprecated Use odp_proto_layer_t instead */ -typedef enum odp_pktio_parser_layer_t { - /** No layers */ - ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE, +typedef odp_proto_layer_t odp_pktio_parser_layer_t; - /** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */ - ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2, +/** No layers + * @deprecated Use ODP_PROTO_LAYER_NONE, instead */ +#define ODP_PKTIO_PARSER_LAYER_NONE ODP_PROTO_LAYER_NONE - /** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */ - ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3, +/** Layer L2 protocols (Ethernet, VLAN, ARP, etc) + * @deprecated Use ODP_PROTO_LAYER_L2, instead */ +#define ODP_PKTIO_PARSER_LAYER_L2 ODP_PROTO_LAYER_L2 - /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4, +/** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) + * @deprecated Use ODP_PROTO_LAYER_L3, instead */ +#define ODP_PKTIO_PARSER_LAYER_L3 ODP_PROTO_LAYER_L3 - /** All layers */ - ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL +/** Layer L4 protocols (UDP, TCP, SCTP) + * @deprecated Use ODP_PROTO_LAYER_L4, instead */ +#define ODP_PKTIO_PARSER_LAYER_L4 ODP_PROTO_LAYER_L4 -} odp_pktio_parser_layer_t; +/** All layers + * @deprecated Use ODP_PROTO_LAYER_ALL instead */ +#define ODP_PKTIO_PARSER_LAYER_ALL ODP_PROTO_LAYER_ALL /** * Parser configuration @@ -436,8 +442,8 @@ typedef struct odp_pktio_parser_config_t { * set. In addition, offset (and pointer) to the next layer is set. * Other layer/protocol specific metadata have undefined values. * - * The default value is ODP_PKTIO_PARSER_LAYER_ALL. */ - odp_pktio_parser_layer_t layer; + * The default value is ODP_PROTO_LAYER_ALL. */ + odp_proto_layer_t layer; } odp_pktio_parser_config_t; From patchwork Wed Dec 13 15:00:14 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: 121779 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5593419qgn; Wed, 13 Dec 2017 07:10:19 -0800 (PST) X-Google-Smtp-Source: ACJfBoun/0jCHvWr7r8Vm+YDzfb4S/8tZ74bjiGP9pQ49Lak4y3RSaMCO4pKsMeUTRBIm4/MToKv X-Received: by 10.55.203.13 with SMTP id d13mr10984330qkj.93.1513177819025; Wed, 13 Dec 2017 07:10:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513177819; cv=none; d=google.com; s=arc-20160816; b=MWyGSW4CRpHV3V7ACbGPv3Yhstr+mt9FlGbG31DWcnI2W0v5ndXDtLjBFYb2hB8TUb MsMPp08EJVhKsgCruFvxxeIaV0mMB2Ckks5UnknR54mtTRPhKxgTn9+N/DFkb1En11jn JL1v2gX7KKOk5mHjkSZSnovriBd2U6t97enGBCKiRxgS/WBtgyHNswVuwaHKCDt5lXqS W+THvdewalIfkqLV+fz9KigqFtT8Z6mBl99QcAQqO8C9xT3GKkAYYFJrgtsiNk6ZvIAc 3JltkYAq3FtzhG2w2QdC1usgw7cm5CVFKp8JHFcMcBWfX+dVdB3qIwjmRxHDgiCzC65D NDXQ== 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=tKHpu8N9LwPs8RcxbMp0jI8I8WWBQ5QY4uVaUlqsyQA=; b=wdwvZa4QdGvbWrSmeahDV9HJz5DLLbzmJ/3VnYQXx7aMyFAE9vDcBU/5ccr3vBXDOx eeDuiLiYkJ8UZWV58v4dadF3Tb8/pLTxQGbbYGrBmHe4rHd3KFQSxzYADsjuh24zVFfR xA9LkgapHWTYhLVjF78At1CD7kw6Gd8lAvkSaP6zl1xKfZsJrq/Go1svVVb85Tkw0SM7 Koof4v2AIr/m1sYvQNZhzrcx39JAF1KOVRpQpdP6AYwZp/tbP1r0olvlldBDkbjs/U4U SuoQPWgZKyuf6Ul50Sp/ZdM/rg1GejCECOVJ1V9KiLCYH1qdFk4Yt+ZLxciVB1A6ujEt 1IrQ== 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 s192si2059249qke.396.2017.12.13.07.10.18; Wed, 13 Dec 2017 07:10:19 -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 9C35860819; Wed, 13 Dec 2017 15:10:18 +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 E62FA60840; Wed, 13 Dec 2017 15:01:50 +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 D140D608EE; Wed, 13 Dec 2017 15:01:41 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 040FC60800 for ; Wed, 13 Dec 2017 15:00:21 +0000 (UTC) Received: from mxback7j.mail.yandex.net (mxback7j.mail.yandex.net [IPv6:2a02:6b8:0:1619::110]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 09E595106A56 for ; Wed, 13 Dec 2017 18:00:20 +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 GUhAX6T5iC-0JvGl7Iw; Wed, 13 Dec 2017 18:00:19 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id TIlNgphY6V-0JwarI3v; Wed, 13 Dec 2017 18:00:19 +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, 13 Dec 2017 18:00:14 +0300 Message-Id: <1513177217-8215-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> References: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v2 2/5] linux-gen: adapt to odp_pktio_parser_layer_t removal 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 7427c77cd44f5de84a2788e6d7d0cefaf146f479 **/ platform/linux-generic/include/odp_packet_internal.h | 4 ++-- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_ipsec.c | 14 +++++++------- platform/linux-generic/odp_packet.c | 10 +++++----- platform/linux-generic/odp_packet_io.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index a16ec3161..40f3edc1e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -296,11 +296,11 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, /* Perform packet parse up to a given protocol layer */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer); + odp_proto_layer_t layer); /* Perform L3 and L4 parsing up to a given protocol layer */ int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer, + odp_proto_layer_t layer, uint32_t l3_offset, uint16_t ethtype); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 025f12593..276430923 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -973,7 +973,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, packet_set_len(pkt_hdr, pkt_len); packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, - ODP_PKTIO_PARSER_LAYER_ALL); + ODP_PROTO_LAYER_ALL); cos = cls_select_cos(entry, base, pkt_hdr); if (cos == NULL) diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 8735e6052..61ce48758 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -200,22 +200,22 @@ static const uint8_t ipsec_padding[255] = { 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, }; -static inline odp_pktio_parser_layer_t parse_layer(odp_ipsec_proto_layer_t l) +static inline odp_proto_layer_t parse_layer(odp_ipsec_proto_layer_t l) { switch (l) { case ODP_IPSEC_LAYER_NONE: - return ODP_PKTIO_PARSER_LAYER_NONE; + return ODP_PROTO_LAYER_NONE; case ODP_IPSEC_LAYER_L2: - return ODP_PKTIO_PARSER_LAYER_L2; + return ODP_PROTO_LAYER_L2; case ODP_IPSEC_LAYER_L3: - return ODP_PKTIO_PARSER_LAYER_L3; + return ODP_PROTO_LAYER_L3; case ODP_IPSEC_LAYER_L4: - return ODP_PKTIO_PARSER_LAYER_L4; + return ODP_PROTO_LAYER_L4; case ODP_IPSEC_LAYER_ALL: - return ODP_PKTIO_PARSER_LAYER_ALL; + return ODP_PROTO_LAYER_ALL; } - return ODP_PKTIO_PARSER_LAYER_NONE; + return ODP_PROTO_LAYER_NONE; } static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 5b5a9827c..50e8aa068 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2200,7 +2200,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->l3_offset = offset; - if (layer <= ODP_PKTIO_PARSER_LAYER_L2) + if (layer <= ODP_PROTO_LAYER_L2) return prs->error_flags.all != 0; /* Set l3 flag only for known ethtypes */ @@ -2231,7 +2231,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, ip_proto = 255; /* Reserved invalid by IANA */ } - if (layer == ODP_PKTIO_PARSER_LAYER_L3) + if (layer == ODP_PROTO_LAYER_L3) return prs->error_flags.all != 0; /* Set l4 flag only for known ip_proto */ @@ -2303,7 +2303,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, parseptr = ptr; offset = 0; - if (layer == ODP_PKTIO_PARSER_LAYER_NONE) + if (layer == ODP_PROTO_LAYER_NONE) return 0; /* Assume valid L2 header, no CRC/FCS check in SW */ @@ -2322,7 +2322,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, * Simple packet parser */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer) + odp_proto_layer_t layer) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); void *base = packet_data(pkt_hdr); @@ -2332,7 +2332,7 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, } int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer, + odp_proto_layer_t layer, uint32_t l3_offset, uint16_t ethtype) { diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index aa6cdb068..ffbc73b26 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -998,7 +998,7 @@ void odp_pktio_config_init(odp_pktio_config_t *config) { memset(config, 0, sizeof(odp_pktio_config_t)); - config->parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config->parser.layer = ODP_PROTO_LAYER_ALL; } int odp_pktio_info(odp_pktio_t hdl, odp_pktio_info_t *info) @@ -1203,7 +1203,7 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) /* The same parser is used for all pktios */ if (ret == 0) - capa->config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + capa->config.parser.layer = ODP_PROTO_LAYER_ALL; return ret; } From patchwork Wed Dec 13 15:00:15 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: 121781 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5594774qgn; Wed, 13 Dec 2017 07:11:18 -0800 (PST) X-Google-Smtp-Source: ACJfBot/8MBoRpdwF/mKpL9bOc3tM/2w4H7Dc6IATMKjmNAQuo+0jQLu2dlPaskwTrQk3uVkBOf6 X-Received: by 10.200.24.80 with SMTP id n16mr11402895qtk.193.1513177878778; Wed, 13 Dec 2017 07:11:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513177878; cv=none; d=google.com; s=arc-20160816; b=LWOx5XibRr38xyMrLo5zxXHnhtncRoCyDaFD+7t/QlWLksH93S6kLEKUL9+9GfmPZG GnIitBd7Yi3UIyK5iVa6UB6k/i9Kf+gWobIaHIlUzQoR2VUVj0h9r4avDzc4hFgMxfJl VipAseBBKT5+1CGgIx/1hqCESCLp75SoiLaZTGN5JAfHNodHxPaGixTp6BzNHhmiHXPt aP0/mkBIXAa9djR+/g6g7H0iWIe0vSi3/rDqd8k3dKGsutr0cOTJunFte2hjnEI0KrN3 CzpJ15v9tU8nnJrUZJHRkkfuHOkPfyJOJNoe+iMlsfJF86Cui30F5EtM4fGXZndglIze 6RiQ== 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=+ELsX6IarIrcP8wWYYh9c+UywKnP2PA6GZXd1rmpbuM=; b=OI6cVGGGK95pXZi+2HulI7ayFzR79KZCrxQusLi98MSYIT4czLVENCHzMJuaZw5SfI 3jvg+m7LQ0/mXvZnhf7ufrW7TpTlbiNXKvcgT4A+qr6WWZWoEQp4BgLlVm+s5xFKQB53 UkKPDUz1JyhUVq6L3fkOg6I+rQ0dXj2BCnX/H7xIHURu3vsfQ2+wuycyWPEkxBlIf0+U 18ChWmlXzl7WNa59TMq0VOu2VX/h2Vsqwj0DoUBIMvsXk1Jz60CekvuHU8cu/gt/cG88 NXh08ROjxq1u5cLePZfvb8S+lOAJ/TcZfy6pqDl9/SBPYXkoFlPC0N0I8+6fbr0bQL+n K4Ow== 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 h36si2013299qtd.240.2017.12.13.07.11.18; Wed, 13 Dec 2017 07:11:18 -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 6B16860825; Wed, 13 Dec 2017 15:11:18 +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 9B73D6092C; Wed, 13 Dec 2017 15:02:06 +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 7000A60922; Wed, 13 Dec 2017 15:01:51 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 6384660825 for ; Wed, 13 Dec 2017 15:00:22 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward105j.mail.yandex.net (Yandex) with ESMTP id B84CD186879 for ; Wed, 13 Dec 2017 18:00:20 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id TtHa2CdbZK-0K0qGdcx; Wed, 13 Dec 2017 18:00:20 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id TIlNgphY6V-0Kw0A5c0; Wed, 13 Dec 2017 18:00:20 +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, 13 Dec 2017 18:00:15 +0300 Message-Id: <1513177217-8215-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> References: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v2 3/5] validation: use odp_proto_layer_t instead of odp_pktio_parser_layer_t 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 7427c77cd44f5de84a2788e6d7d0cefaf146f479 **/ test/validation/api/ipsec/ipsec.c | 2 +- test/validation/api/pktio/parser.c | 2 +- test/validation/api/pktio/pktio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 7b39c2c5a..b99bee94e 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -84,7 +84,7 @@ static int pktio_start(odp_pktio_t pktio, odp_bool_t in, odp_bool_t out) return 0; odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.parser.layer = ODP_PROTO_LAYER_ALL; config.inbound_ipsec = in; config.outbound_ipsec = out; diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index 66e726d09..1788d4d64 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -122,7 +122,7 @@ static odp_pktio_t create_pktio(int iface_idx, odp_pool_t pool) } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.parser.layer = ODP_PROTO_LAYER_ALL; if (odp_pktio_config(pktio, &config)) { printf("Error: failed to configure %s\n", iface); return ODP_PKTIO_INVALID; diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 39451de3b..a6820a1de 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -1230,7 +1230,7 @@ void pktio_test_pktio_config(void) odp_pktio_config_init(&config); - CU_ASSERT(config.parser.layer == ODP_PKTIO_PARSER_LAYER_ALL); + CU_ASSERT(config.parser.layer == ODP_PROTO_LAYER_ALL); CU_ASSERT(odp_pktio_config(pktio, NULL) == 0); From patchwork Wed Dec 13 15:00:16 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: 121782 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5595488qgn; Wed, 13 Dec 2017 07:11:50 -0800 (PST) X-Google-Smtp-Source: ACJfBovHC808/wAMF65tjSOG21AnLTSSehLmvTK1mb0f3fl9JXUTwO0uJECHCKRkpGqYSGvoJ1e1 X-Received: by 10.237.42.230 with SMTP id t93mr11703407qtd.50.1513177910285; Wed, 13 Dec 2017 07:11:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513177910; cv=none; d=google.com; s=arc-20160816; b=aQYfP+bKurW2nwU5pd6HXTixV6Ab1rBfyGVA18fYMwHOfIi3aHRwTmzhd1WgstFF7s MN18N83dQ8RJsyg1f4Eyqf05g6HmkdJ9Hn1fVgvFdLdiEXDaL7LzA8mNe6ZTtB3tH3gC mCGhu2ZlGSYoyyjsXxjSBCLYMfxudqTJgOp5L9hAhkn4255TJlSMTrSiuaMfELwNEwCL Hll+LMfrv3imfqaDJo/j6tBTxQbBklV2hgGSIhLxVz09nEXXHyGvRkZG18tbx7nj0zz+ LK3yft9oLWYsU/Y5+02zhBez2Bs4X8ZiuvEwswUv9isxzkDHCIWZC4mnOQ2VlidRceRx dZvg== 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=kRPW6phkGzwRpFej3AdO0bCTWgQ0V6G5EdY1Vt2/5JQ=; b=J4roIApRIaD7tQoxGphUHlDRLCftkfVLzO8MDH9RZmd2JqwQp2ZFEq5hBq6wn7NgR/ ERkCgJ7Azty/EgzrMan3+RQ1Eps4083wluYih7hnzsKt6Cm5Wo/m12og/rAKb7had1Id Ictw74cXkR9g2Z2QHMTZ7QC+vm0SHpbUeFF7dNTkywgjVbDM8gJXWq36/JQ69KRIPs6K l6ozx0odItvCHXha8kbFkyUif+XkNImymFCMtNrDMhKv/zH7HRi0pp81dJuvmBpEVP2Q klfkcm2TGSKdh2X0fCDhcRgr46uRRWWbz+KOKG+NjAptX8/SsNw5aWAC4lZJ83V3zl/t GdwQ== 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 28si2031854qtq.382.2017.12.13.07.11.49; Wed, 13 Dec 2017 07:11:50 -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 DD44A60732; Wed, 13 Dec 2017 15:11:49 +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 E07E66091D; Wed, 13 Dec 2017 15:02:12 +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 F11F46091E; Wed, 13 Dec 2017 15:01:51 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id B8CF76083F for ; Wed, 13 Dec 2017 15:00:22 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 545BC785860 for ; Wed, 13 Dec 2017 18:00:21 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id XaVxWuuXyQ-0L4uxBXk; Wed, 13 Dec 2017 18:00:21 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id TIlNgphY6V-0KwWuOGf; Wed, 13 Dec 2017 18:00:20 +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, 13 Dec 2017 18:00:16 +0300 Message-Id: <1513177217-8215-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> References: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v2 4/5] performance: use odp_proto_layer_t instead of odp_pktio_parser_layer_t 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 7427c77cd44f5de84a2788e6d7d0cefaf146f479 **/ test/performance/odp_l2fwd.c | 4 ++-- test/performance/odp_pktio_ordered.c | 2 +- test/performance/odp_pktio_perf.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 0ebb0dd17..27b299399 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -737,8 +737,8 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, odp_pktio_config_init(&config); config.parser.layer = gbl_args->appl.extra_check ? - ODP_PKTIO_PARSER_LAYER_ALL : - ODP_PKTIO_PARSER_LAYER_NONE; + ODP_PROTO_LAYER_ALL : + ODP_PROTO_LAYER_NONE; if (gbl_args->appl.chksum) { printf("Checksum offload enabled\n"); diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index ed4e2e8e4..2248eb2fd 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -618,7 +618,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index a4599de62..4c09b12e4 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -797,7 +797,7 @@ static int test_init(void) * affects scalability. */ odp_pktio_config_init(&cfg); - cfg.parser.layer = ODP_PKTIO_PARSER_LAYER_NONE; + cfg.parser.layer = ODP_PROTO_LAYER_NONE; odp_pktio_config(gbl_args->pktio_rx, &cfg); if (gbl_args->args.num_ifaces > 1) { From patchwork Wed Dec 13 15:00:17 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: 121780 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5594390qgn; Wed, 13 Dec 2017 07:11:04 -0800 (PST) X-Google-Smtp-Source: ACJfBosyLPzs8YqFH5dNfpspg4fZOJJW0q43sg8CVmT94XGgJlA4a7ntLtGajlCtCba8lK4YGvG+ X-Received: by 10.55.82.194 with SMTP id g185mr7445290qkb.279.1513177864116; Wed, 13 Dec 2017 07:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513177864; cv=none; d=google.com; s=arc-20160816; b=07K10Tfk5Ze4NbC+nv9pbixG+rJrxOwOLi2k6Hkv33UO+3TGbCgKEp9G3+bc0gAhqG rIRiZOyw/ZCyZhYPGgICGE3QGv/N6kUGNyHxfrnqtef5SLOKuBhryNTrOt552JcaRZWw W6R0NdstmYi0EHLdV5nCO8PP0Y1vFrH+nmZdijEvul6HXn4JRQh7LzoE6l2pdiWg2lhL 5jJhnKo0CKmRtcnMxM2JkqQ7zzTd1YDRXGfjPBoHmBReg0PGVFR2e2OpGsELkqB38S4e c/Adb07PtnFd5qij8M9+2MFM8CNs+Et5gBsvIck6O19k+QzdSVDftJrbgBgNeHGIRHRJ KjoA== 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=XjzEXqfFcjj2tPXNAgqX60T1xsjI8iz+NJiayB1VacA=; b=Y3vKAv3NkpPJHPCkKU+xAeq+6EWY8sfuh8dN9z6HSicXN0R6PGhkYG/KjwzHJbLbVa mxdIwlTuPEDGEIr68brg5sU63MgpnrKmb1AZOg8PtDUAN1UQOf/Dp1R4/VF7UA2rwbrI GNbqLcbz5pnCiib4FVQQNJLYDOpFC35GQ3EEK9tItTxNmVl6c9B5oDx8Fiw1JfiwNTQF I5g6Yvu6iSRnhl2z2bZehrMlfKNQLnU/4eq/SO/Nrl3FTh63f3Hvi9886lVrutHeVJ0O Aji+92W2t2b2gi54FWWIDVTRaVMDKFdgmX8hDOtro5UCPL7LDBWeDndaqjrCPLmEa3cl nFyA== 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 b84si2185942qkb.17.2017.12.13.07.11.03; Wed, 13 Dec 2017 07:11:04 -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 C863F6074A; Wed, 13 Dec 2017 15:11:03 +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 23F276091E; Wed, 13 Dec 2017 15:01:56 +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 A87F76091E; Wed, 13 Dec 2017 15:01:48 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id C182660840 for ; Wed, 13 Dec 2017 15:00:23 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward105o.mail.yandex.net (Yandex) with ESMTP id D18794443A47 for ; Wed, 13 Dec 2017 18:00:21 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id CTcpJZLs8u-0LYepnVS; Wed, 13 Dec 2017 18:00:21 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id TIlNgphY6V-0LwCgb0H; Wed, 13 Dec 2017 18:00:21 +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, 13 Dec 2017 18:00:17 +0300 Message-Id: <1513177217-8215-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> References: <1513177217-8215-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v2 5/5] example: use odp_proto_layer_t instead of odp_pktio_parser_layer_t 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: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 7427c77cd44f5de84a2788e6d7d0cefaf146f479 **/ example/l2fwd_simple/odp_l2fwd_simple.c | 2 +- example/l3fwd/odp_l3fwd.c | 4 ++-- example/switch/odp_switch.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index e63814555..2592c3744 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -52,7 +52,7 @@ static odp_pktio_t create_pktio(const char *name, odp_pool_t pool, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&in_queue_param); diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index d5a24aa63..3946546fb 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -123,8 +123,8 @@ static int create_pktio(const char *name, odp_pool_t pool, odp_pktio_config_init(&config); config.parser.layer = global.cmd_args.error_check ? - ODP_PKTIO_PARSER_LAYER_ALL : - ODP_PKTIO_PARSER_LAYER_L4; + ODP_PROTO_LAYER_ALL : + ODP_PROTO_LAYER_L4; odp_pktio_config(pktio, &config); fwd_pktio->nb_rxq = (int)capa.max_input_queues; diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index be4830998..3e52970be 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -240,7 +240,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param);