From patchwork Tue Dec 19 17:00:55 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: 122398 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4421764qgn; Tue, 19 Dec 2017 09:06:48 -0800 (PST) X-Google-Smtp-Source: ACJfBosaRbJYgpiwpijA2UJ9Kdc0EGFVgSyZfYKwYbGuOIl918tMwcVtX0aaMVJP2/lGcoggs6Du X-Received: by 10.200.54.236 with SMTP id b41mr6282173qtc.280.1513703208177; Tue, 19 Dec 2017 09:06:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703208; cv=none; d=google.com; s=arc-20160816; b=lVLBLJ6IddheuOSbpgNJJNmQ6yIAvvSarDsTF0UMa5PJlAoWIv1c/fdizXp3zmIBHv uX258e/f47dJMXrwEzdXsaPDqGudwnkHbhxU144jaj8F0MH/S8rsJTDFS5z5xocnGCn/ gKNwUpUNqiAVt0U4iwHxtLIU1b3Xpfb+Bg1zHlOoFiNFg0634Qthw6hQbkSMV3BmCg5g 9oK5s1NZwFzikAUcIE9zcC6NCOI2CSUPCxrysZtdQD0SyA1JqK4TuywQ+BOFmRg9P79k 6oIIFiIogX9zQGTgsd8dBM4KyeV69lo9fgRDpyeev8gG9cp+d30rijCdGdfi3211x5Sj A03Q== 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=qcB0d4dvkiPYkVn527PXG5fID5jw65rE+bJ8n6q1JmE=; b=qHqXAzAAXh3MX3wMXqCApuGv0WajSX36uWcefbI2sNdQMpS3ulOax5+BS5QYHxncoM WQlzF1PSbb49RMUabM+R7uma5rzkDHLVGUfl0/7AvWH2opdZc3VUIEISzqEbxe7jR59m 25Jq1h8KhJWw60dNIqNXBdEzHfddR8apDCoQCW5uUIAuR+0jjX0m6DgLFy89p1Q3h2eJ hr4ShsLExq10hIIdeY9jHsiDfNhIAyHFfvPySWJyUPpV7HHavc4wxzDlzPmbzaTrsCUs YOulUXxlGmBlM4Zc2O7IUVzgUCWAJJOMhQbfH4qWBap9an80xcF86f0WgWtUVvBKQfbr dlig== 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 v185si1041155qkd.338.2017.12.19.09.06.47; Tue, 19 Dec 2017 09:06:48 -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 BCA4560953; Tue, 19 Dec 2017 17:06:47 +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 CD61961513; Tue, 19 Dec 2017 17:02: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 2C2C661512; Tue, 19 Dec 2017 17:02:50 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id B245B60C31 for ; Tue, 19 Dec 2017 17:01:10 +0000 (UTC) Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward101j.mail.yandex.net (Yandex) with ESMTP id B4EF41243B43 for ; Tue, 19 Dec 2017 20:01:03 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id yAOIexyU4h-134CkGEM; Tue, 19 Dec 2017 20:01:03 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fHOaUHATqc-12YmASVZ; Tue, 19 Dec 2017 20:01:03 +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: Tue, 19 Dec 2017 20:00:55 +0300 Message-Id: <1513702859-14312-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> References: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v3 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: 12fd3a9224a856271934986a1bad981843915d68 ** Merge commit sha: f11c958e9552610bd1305f996e17c6b79a209a7e **/ 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 Tue Dec 19 17:00:56 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: 122401 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4424378qgn; Tue, 19 Dec 2017 09:08:47 -0800 (PST) X-Google-Smtp-Source: ACJfBotG1Wk8mcbaT7eifGHdHQ22ccoDFmJQY+FNzcNe8P1FtmfsN1AABMXwH2CIm7lTTK0nX6fO X-Received: by 10.200.28.7 with SMTP id a7mr6049942qtk.206.1513703327338; Tue, 19 Dec 2017 09:08:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703327; cv=none; d=google.com; s=arc-20160816; b=Sp19/vE7vLHSur05KWgrvchSRW5w3BUXki4yPq1QBNFVXCyozsICIUYVnjBs8XCn6y DK/xND8iaZ7aAFjVluOItcXaXAGemDP6ZmsorXSN3tLFXAJaRtAThIHgsDg2ujxTivfL WCGoQoWVKJwu3axQCGJVs1cNMhaEMV6pJiBtXYukA2oK4M2E53Mg+yA6nOcFT5SZEkq4 y6NLpspV6xV9P36FZM5m2AB/SsZz4GydxdhZMHG1/HLGlybZiJqjUpUsTaAJy0ymwPRw eYOXrlwQs6PK/G9gdoMN0pAMmjQUweBDJ5fjVXghJnKMi1W34NAXO0AHKskZphXWdU+P xAKA== 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=U+hqF1IcLEIAvhekhqfy7mw0F8OqTSx0dIxHfKrcWzM=; b=WRJxKCyAzQEfHyVLA9EFXVT9OXFJlgaYb/GRoM6AJt39mzTPenXg+hKD0wr3BvUWyA IycuSpzGgt38Ncs/XzuC3rQ5NM5xD42moke2+NOR5wj3WXBJTSbqvd0prygbRtPxgfhT Ld+HQ+7W1U63zRbP8IR5jBKaiDeKVZEHB2Kk8MD0EQpeM44u2ni7UUgIdefM5ramQLDd MswLw2p9mxbYsewuG85FtaFjCAqJdotPTjLkmHQ+oQm7FUdEXDdREik6e6FzPFkmaThU 13Y17UdLXJH2B37uvH+GGP4dgfE3p2L0jFzaXrUSSF9NBVon5yf3BVrrS3jefzP11TH3 FrxA== 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 p63si424513qkb.296.2017.12.19.09.08.46; Tue, 19 Dec 2017 09:08:47 -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 C08DC61516; Tue, 19 Dec 2017 17:08:46 +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_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 EADAF6151A; Tue, 19 Dec 2017 17:03:29 +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 DE86461522; Tue, 19 Dec 2017 17:03:20 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id E959E608E7 for ; Tue, 19 Dec 2017 17:01:23 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 949722184561 for ; Tue, 19 Dec 2017 20:01:05 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id p8G0TCW9ir-15Y4cE11; Tue, 19 Dec 2017 20:01:05 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fHOaUHATqc-15YOT6TC; Tue, 19 Dec 2017 20:01:05 +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: Tue, 19 Dec 2017 20:00:56 +0300 Message-Id: <1513702859-14312-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> References: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v3 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: 12fd3a9224a856271934986a1bad981843915d68 ** Merge commit sha: f11c958e9552610bd1305f996e17c6b79a209a7e **/ platform/linux-generic/include/odp_packet_internal.h | 4 ++-- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_packet.c | 10 +++++----- platform/linux-generic/odp_packet_io.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 0f661679e..346c2dc6f 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_packet.c b/platform/linux-generic/odp_packet.c index cf76df72c..72d1ca625 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2211,7 +2211,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 */ @@ -2242,7 +2242,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 */ @@ -2314,7 +2314,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 */ @@ -2333,7 +2333,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); @@ -2343,7 +2343,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 Tue Dec 19 17:00:57 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: 122399 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4422768qgn; Tue, 19 Dec 2017 09:07:32 -0800 (PST) X-Google-Smtp-Source: ACJfBosvjV+19u0g+x9IbeuoUGXaf6v0tOJ2AEhVyal99+L2FQ8HficeaAYgQv3Epd13Cf9/0zha X-Received: by 10.200.50.39 with SMTP id x36mr6388786qta.255.1513703252361; Tue, 19 Dec 2017 09:07:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703252; cv=none; d=google.com; s=arc-20160816; b=Xc/ieJdcAJN/CTaJmE04DjBV/7ZOG5qGWKvciIon3+0AkMqPq0zdihubpCmJgJSLRC raYFCt98SPiwPw1ah7XW2BDU4ndMcgcspGcCkZaW5TzlNk5IOjA55/pIk0yeHioEnCl6 5H0N0IriufkeDJwmD6pRkvT3l91cCB6hud02nwqghIzomeg6hW33XfP+Oz7zzGCqdLu1 2GvLCndevlJPMbuiYWs7mLy5rYl5tY7Eye3pYNUuEgltHzS5wKsmo8JkU57Xya5zBZ2b rqcvFO0yOxvZMEfOSLCtlQfGbCXKL1hypgfPNz+TLrkiNnEr/S1zy/L1yI6YkqE3LkjZ OItQ== 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=0YVLdKAXjh65/hMkRIr3KkUN/5e8tgIyTfmZu8f9IRg=; b=mAFAAVtiVfvIEAULmjonFA2z0/TJMXYoRDIEbxQgdvDWNrye1mG/kQtXp7PAQTmkoi IHL87KSgPiZDj1z7+GOynfXVcSG6T8ozikV4uSQu0joXqgUZrWFaFR2e6pnppwJuj5To Mj556LWaJi2rQpnBRJOCP8/jhuadV10Hw//+1fuOa/U/tHtSmAIFlNUpOf9vYkejno/m E2Pms0fZmftDy/bjjmpIkUe7TzSTnEOwoGjWlykW862tiRFv1wD8izgQXEdxEdpscIch 9b0W1I0tIyyANT/iY9U5ChZwJww2QP7yibnEFRGR/sf3hVPz3yiP+8CAuydYOE04+aDq 9JGw== 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 q27si2689800qtq.459.2017.12.19.09.07.32; Tue, 19 Dec 2017 09:07:32 -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 19D9C609A2; Tue, 19 Dec 2017 17:07:32 +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 1559661511; Tue, 19 Dec 2017 17:03:03 +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 C6F0261513; Tue, 19 Dec 2017 17:02:54 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 1C17360975 for ; Tue, 19 Dec 2017 17:01:11 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 3539012448ED for ; Tue, 19 Dec 2017 20:01:06 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 1KLgkkQ3b9-16qeA0Tt; Tue, 19 Dec 2017 20:01:06 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fHOaUHATqc-15YOqomU; Tue, 19 Dec 2017 20:01:05 +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: Tue, 19 Dec 2017 20:00:57 +0300 Message-Id: <1513702859-14312-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> References: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v3 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: 12fd3a9224a856271934986a1bad981843915d68 ** Merge commit sha: f11c958e9552610bd1305f996e17c6b79a209a7e **/ 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 097216730..9d263dfcd 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 Tue Dec 19 17:00:58 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: 122400 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4423601qgn; Tue, 19 Dec 2017 09:08:08 -0800 (PST) X-Google-Smtp-Source: ACJfBovRFXgvy2qG2MKjsgkhHpkDI3FYxz8d7hGq/MRk/sLjhpGR0loFOn0M1EtuLDpbP7CzCs0k X-Received: by 10.55.43.38 with SMTP id r38mr5958097qkh.25.1513703288817; Tue, 19 Dec 2017 09:08:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703288; cv=none; d=google.com; s=arc-20160816; b=nM8xxjOjGwzvpP0axcLCZxEydnFiEzsbqkToMMtl/TdIcs9NFqZz1ERg0RNcYE02vl fwdMvCivA2oaJW//uRr7uJ42czTkxZ4ZQui4wjzdpNyPfLbt6PCooQdIj818xa/PTDbs G45ohzTRv6SxgDhCDYeIRSBWm1tfOSA8qnpB4ZNiPB++6CNBt5rkytdrC4+cENlDkQHf 7HMTtexNYuYgbjlUeQDJ91/avh1kW4JseGUWRI0I4IBWpEKGGaODvuUiRDVbXl/X1xNT alLdBfEQtOVtNaenfZSI1UyxF52XnAHOmSAKK1WOzuFi/3whbIx74QAZc96J0v8jgUek KZ9A== 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=vzSBpAVLNwB2zcq826OMt+bPhqSeSdrcq4VDzr3LWh0=; b=vVDHqrIDF0OzPzT/sIH8+ElfiVKAPKLU6i53by4JfQbofLBKBVtZDu7PBFxNtQ68SW Ll57J+oxytBJMSOe4a5WSyK7R91RpXUvGWJ68h0OcmtA54MHErfvyZ7+KF36Dgt93Cn0 uT1TLhS759eN5h4NdxFLZI80eRFAPTHdkYcxpvnbuUGgJ2Q473gNRY4F75vgwnOsUyd4 23xtOCCgUhXSVIxCmwpL5yHTKU/u72LuZN7CsaYcOut5e9VX/csYAHcsZpAxm/qjH+V7 H6dH/h4KkOLfcqQsQm/wZQ1HE3pebGnYiMhkhxIHKTQeoMLzlAfKoRecjwP4KCT+XNEs YT/Q== 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 r71si5879897qkr.428.2017.12.19.09.08.08; Tue, 19 Dec 2017 09:08:08 -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 8894E6151C; Tue, 19 Dec 2017 17:08:08 +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_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 6BC0E61524; Tue, 19 Dec 2017 17:03: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 9ECC36151D; Tue, 19 Dec 2017 17:03:03 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id AD1F5608CE for ; Tue, 19 Dec 2017 17:01:19 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 1B5EE408283A for ; Tue, 19 Dec 2017 20:01:08 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id i0OPvRiTqf-18SWwYST; Tue, 19 Dec 2017 20:01:08 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fHOaUHATqc-16Ymkr5X; Tue, 19 Dec 2017 20:01:06 +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: Tue, 19 Dec 2017 20:00:58 +0300 Message-Id: <1513702859-14312-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> References: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v3 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: 12fd3a9224a856271934986a1bad981843915d68 ** Merge commit sha: f11c958e9552610bd1305f996e17c6b79a209a7e **/ 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 Tue Dec 19 17:00:59 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: 122397 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4420922qgn; Tue, 19 Dec 2017 09:06:09 -0800 (PST) X-Google-Smtp-Source: ACJfBotcWqRQOc45LHOw0XZ3tVzt+SCBfIZ+gC/PJWKf8CnDVVhzS0EeyffJ2TxlT0lWOLPbv+dl X-Received: by 10.200.40.15 with SMTP id 15mr5694329qtq.74.1513703169688; Tue, 19 Dec 2017 09:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703169; cv=none; d=google.com; s=arc-20160816; b=0D87MQa4UJvZICyGUekxXkgqlA2yzpS7J0d2Om+RFpn+bxdiTcOp1gZa9U5Q81kGRn WiY2LYAc5G5njmTxW2z7vgCzgGQuo/00mmQWMDMlqU9H+7SNTxfW3+WLBpBSFJQPMDRf NYcoJ8Xsl5VelL5kBJg27wIdFf1hKEQOofQPD+aaUONu+wN81q/kwadu7nCRHrmvmnTN kCSN5/00z9CQvalJg8uLV7qwsYR6CZzgrpbUVh18f3G5qT62NfC1cdCKGJgVeUyl3FVd kzvWb3aV0SGhCI58C8Je30FLmrG665toIMCSuPD8V5Ds7xYozA+fRbShACyXIkxsDs9G Kxlg== 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=Suhk5terl+zYbnQxhH17s6g+LHwuMAItlPmdfZYE31s=; b=rlBEatWilptfp9TS6TlZuLer7C7g01wxRHSeG44R5YS7U3Cr9ygN30adoanDdPvI// cnwEheTCOcsox7ObH1OgwriopxQpbsG7BuBcyFUiLJKmLtvciJiISJ8RokPLNs29BOBw LhZgYhcATYUbX+Zi8MaLsTE0sK/uGvPQ7Bc1vL4tVntD1EprPXf2TGN35kRhHNBxryhH FgaYRMcggY3V4uYjQtGrzncRIcoDMFso5IOG76lEvcehV6/oDjzhZ6uKrx+vO84fRDf6 1jEw3GgbPPjxMKrIhWyLEENDbBmeDPP1H6ARb95CooDdxn53qGzo3LFvb3mQ+YwoIh8p sI/Q== 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 123si1231572qkj.192.2017.12.19.09.06.09; Tue, 19 Dec 2017 09:06: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 647E8616DC; Tue, 19 Dec 2017 17:06: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 3EB9660974; Tue, 19 Dec 2017 17:02:51 +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 B5A0761515; Tue, 19 Dec 2017 17:02:42 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 949CD60974 for ; Tue, 19 Dec 2017 17:01:10 +0000 (UTC) Received: from mxback9j.mail.yandex.net (mxback9j.mail.yandex.net [IPv6:2a02:6b8:0:1619::112]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 4334A182345 for ; Tue, 19 Dec 2017 20:01:09 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback9j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id QDXqwXpPd8-19xKJHQf; Tue, 19 Dec 2017 20:01:09 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fHOaUHATqc-18YOadv6; Tue, 19 Dec 2017 20:01:08 +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: Tue, 19 Dec 2017 20:00:59 +0300 Message-Id: <1513702859-14312-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> References: <1513702859-14312-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v3 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: 12fd3a9224a856271934986a1bad981843915d68 ** Merge commit sha: f11c958e9552610bd1305f996e17c6b79a209a7e **/ 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);