From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 00828428F8 for ; Sun, 9 Apr 2023 17:36:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8B644067E; Sun, 9 Apr 2023 17:36:47 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) by mails.dpdk.org (Postfix) with ESMTP id D592740141 for ; Sun, 9 Apr 2023 17:36:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f4OMLFS9aBXOeo3aEfG0opaPbV7EmHrpsSQi4CYZ/9e7Bcc+pJsDMHuN8XsyL7t2IesA3Ag/5oTMmf3kAEbRFxd87w6yD1MtAc3/KTVwS0OHmAAW1fYbUQZ1L2aQBpT2EazTBEW0VYIRHRdMpSlnjP2J/kuh8n2WffWAWV/qglGJlq2YKMEZGB/uwC9H4V2Yturyk4IjpS890fO6c8vRvo+bPBydpRQk8AFLdllSAFOah8xnPAhoDO23qZr0+hwN/2JBuUdGeeapuqpQvghWpcWrWaGEAT+4ShzzXqW0IpSkCSJxDw3iZCa+PuQs4GEpocH91UwEZjNL+FYBdw8fwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v3SQkYOrevSUURc6ukDFg5Vn5hwEq91O1E6MqzE76tA=; b=Lce98OggM50DiY2m7YulpOMME+mHod9f1BP62TeCRYaAvddMiUdiXkHUwaMwbDYo6ypVGnVAiHuAO1AjoKphuHAov2+dI0XWZj+COP/4Bz1o+uKY2/pPr/KnyTSrhG9af3sXnzqnN9vK2VF9R/kCZCKqdOUCl8hGxS2cxSiri+1C80w8ll4REd2XYeWOHyhS0CAvX01o0/S8QwzZB1L+c9Y6jUmo1LDGk26t+ykZgLBJjso7LO9XO4//Idx7sUOrMnUtQHxVCkuCKXQopZn/QulTMgImeWJV9AJmhwQ4qBuzkZpcKnQnk9srqZhJrvFV6t3qlcj7bEVy0zs39OZeXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v3SQkYOrevSUURc6ukDFg5Vn5hwEq91O1E6MqzE76tA=; b=FZ6pNcOdRxW1am3oIjK3DPvLIgaorpsJHLAkDD92daprHR1W2dFLhvApAPc7i7NojxyhiZ6Fw/wa0CupF2K8AUklBuzwfGEtpbGzbM4voS83u0W4UoBfUNadzIgzxU4eez9rtINGA8wOjSQC77TN+89sntje36ZgIYA83lRABoMrCDvRFm3RvFRRmhrxxARY9Jh/I4lze4mxn1weoj3rkqiWzakWJS2Jwf60JrlwzVpzBNyXW3IvCLaOQTQLQSBltbIE8JANgvX5ifuDrbQeel/lM1c0NiTjnCDesNlJtENe9fJYAmUgKdbmvNXvK0I2oYDl9aSEVNOtFy/Lv3o3Kg== Received: from MW2PR16CA0063.namprd16.prod.outlook.com (2603:10b6:907:1::40) by CY8PR12MB8194.namprd12.prod.outlook.com (2603:10b6:930:76::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.31; Sun, 9 Apr 2023 15:36:43 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::21) by MW2PR16CA0063.outlook.office365.com (2603:10b6:907:1::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36 via Frontend Transport; Sun, 9 Apr 2023 15:36:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:36:43 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:36:33 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:36:31 -0700 From: Xueming Li To: Michael Baum CC: Ori Kam , Ferruh Yigit , "dpdk stable" Subject: patch 'app/testpmd: fix encap/decap size calculation' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:16 +0800 Message-ID: <20230409152529.5308-129-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT043:EE_|CY8PR12MB8194:EE_ X-MS-Office365-Filtering-Correlation-Id: b21ecc4c-f6e0-4470-168b-08db391038ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O5WGyBij54YfhY+4/p4tsec7Aq0JtV6Il8/vkK81JVoEvRFrSV6/9AmOqm6IWvdQEiIRa1bssvLcj9F3rPIEqvJuJAARa3MDV3zK8b8L5U6+PYQF/75qOvspOIX6wPpqvJU8nlCb2pzOn4R1vhWQ0aEGudsvLV0HOLTuI1R1Xi5aVY4XXni0PF6WeoB6qKRjwvWoIXsUR0urrHO2Gds7jnqte3D/DfnAPYOz9WD5BqFZxxD09GTQbTPlk95Omg2oJb2rEmKQdDb2HQmlp1yLodd1nRnaGZ72aZgfCIgUeEx3djsy3i6rAnObMap0spo8RS3iAk+Jjk9bZ3AGlJAMXXHgdGwU7BIbpFt/hEqZliDkfe5rcZ5hPyGsC/HKA4pyQIMZv2N9vp24IUQLOmfiLQoWQ5rZKmZJvOJro81g5G1nPh8Zk7firPe2WfXRCi1rK9EThZDR79tMxOGV5F03SmbDzCHY7uThfHDJUsPfSqwqtppsPgNKlayb42iYI7rv8mf3Yck3ZuIRR1rOF+REHHIarBwPq5d/yesMTzJQI0t75bJ+IHL/2Litaweg8VZ0VPFn8wOM9Cha0GjsGjjy0nore2QbdmBsbwdz5+AsZJP1pjJ/3bo744WRDUOVNP/QqS9K8DxUzygkw/CQafisuc3QyM+LIHH0I/5x87UCZZ8rpdNvGD0OwNOcW0lVilU7ZQ7+rtgC1sg6skm3gOmtDuaIR4tPohIb1RjVPOiew8X+eBaPOb10SAcFNqXcgWcsAu1W3HeV44FsYmc0M1ZKAYDLslWbpJUSwSyRlYOBGvEAHru62F4QLNhbAjQEyoVsIglxmGxArccq+DhJdSXa5g== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(396003)(346002)(376002)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(7696005)(83380400001)(36860700001)(966005)(336012)(426003)(2616005)(47076005)(6666004)(26005)(6636002)(16526019)(1076003)(54906003)(186003)(53546011)(37006003)(478600001)(2906002)(30864003)(4326008)(7636003)(6862004)(5660300002)(40460700003)(36756003)(40140700001)(82740400003)(70586007)(41300700001)(70206006)(86362001)(356005)(8676002)(40480700001)(8936002)(55016003)(82310400005)(316002)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:36:43.5474 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b21ecc4c-f6e0-4470-168b-08db391038ba X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8194 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/1cbb884f358ba31219bd9e981bc28c5e2bf349c7 Thanks. Xueming Li --- >From 1cbb884f358ba31219bd9e981bc28c5e2bf349c7 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 16 Mar 2023 20:24:12 +0200 Subject: [PATCH] app/testpmd: fix encap/decap size calculation Cc: Xueming Li [ upstream commit 7bdf7a13ae34dd9c5d8a6aeef7019003dade6f83 ] Testpmd app has some functions to create either encap or decap buffer for some special cases: - "l2_encap" and "l2_decap" - "mplsogre_encap" and "mplsogre_decap" - "mplsoudp_encap" and "mplsoudp_decap" The functions use both "rte_flow_item_eth" and "rte_flow_item_vlan" structures to represent the headers and copy them into "raw_encap" action. The size of either "raw_encap" or "raw_decap" is calculated as sum of headers size. However, the both "rte_flow_item_eth" and "rte_flow_item_vlan" contain more fields than original headers, so using them cause bad size calculation. This patch uses "rte_ether_hdr" and "rte_vlan_hdr" structures for header size calculation. Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation") Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation") Signed-off-by: Michael Baum Acked-by: Ori Kam Acked-by: Ferruh Yigit --- app/test-pmd/cmdline_flow.c | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 88108498e0..042da57a61 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -7737,15 +7737,15 @@ parse_vc_action_l2_encap(struct context *ctx, const struct token *token, l2_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, l2_encap_conf.eth_src, RTE_ETHER_ADDR_LEN); - memcpy(header, ð, sizeof(eth)); - header += sizeof(eth); + memcpy(header, ð.hdr, sizeof(struct rte_ether_hdr)); + header += sizeof(struct rte_ether_hdr); if (l2_encap_conf.select_vlan) { if (l2_encap_conf.select_ipv4) vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); - memcpy(header, &vlan, sizeof(vlan)); - header += sizeof(vlan); + memcpy(header, &vlan.hdr, sizeof(struct rte_vlan_hdr)); + header += sizeof(struct rte_vlan_hdr); } action_encap_data->conf.size = header - action_encap_data->data; @@ -7793,11 +7793,11 @@ parse_vc_action_l2_decap(struct context *ctx, const struct token *token, header = action_decap_data->data; if (l2_decap_conf.select_vlan) eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); - memcpy(header, ð, sizeof(eth)); - header += sizeof(eth); + memcpy(header, ð.hdr, sizeof(struct rte_ether_hdr)); + header += sizeof(struct rte_ether_hdr); if (l2_decap_conf.select_vlan) { - memcpy(header, &vlan, sizeof(vlan)); - header += sizeof(vlan); + memcpy(header, &vlan.hdr, sizeof(struct rte_vlan_hdr)); + header += sizeof(struct rte_vlan_hdr); } action_decap_data->conf.size = header - action_decap_data->data; @@ -7877,15 +7877,15 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, mplsogre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, mplsogre_encap_conf.eth_src, RTE_ETHER_ADDR_LEN); - memcpy(header, ð, sizeof(eth)); - header += sizeof(eth); + memcpy(header, ð.hdr, sizeof(struct rte_ether_hdr)); + header += sizeof(struct rte_ether_hdr); if (mplsogre_encap_conf.select_vlan) { if (mplsogre_encap_conf.select_ipv4) vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); - memcpy(header, &vlan, sizeof(vlan)); - header += sizeof(vlan); + memcpy(header, &vlan.hdr, sizeof(struct rte_vlan_hdr)); + header += sizeof(struct rte_vlan_hdr); } if (mplsogre_encap_conf.select_ipv4) { memcpy(header, &ipv4, sizeof(ipv4)); @@ -7972,15 +7972,15 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token, mplsogre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, mplsogre_encap_conf.eth_src, RTE_ETHER_ADDR_LEN); - memcpy(header, ð, sizeof(eth)); - header += sizeof(eth); + memcpy(header, ð.hdr, sizeof(struct rte_ether_hdr)); + header += sizeof(struct rte_ether_hdr); if (mplsogre_encap_conf.select_vlan) { if (mplsogre_encap_conf.select_ipv4) vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); - memcpy(header, &vlan, sizeof(vlan)); - header += sizeof(vlan); + memcpy(header, &vlan.hdr, sizeof(struct rte_vlan_hdr)); + header += sizeof(struct rte_vlan_hdr); } if (mplsogre_encap_conf.select_ipv4) { memcpy(header, &ipv4, sizeof(ipv4)); @@ -8071,15 +8071,15 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, mplsoudp_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, mplsoudp_encap_conf.eth_src, RTE_ETHER_ADDR_LEN); - memcpy(header, ð, sizeof(eth)); - header += sizeof(eth); + memcpy(header, ð.hdr, sizeof(struct rte_ether_hdr)); + header += sizeof(struct rte_ether_hdr); if (mplsoudp_encap_conf.select_vlan) { if (mplsoudp_encap_conf.select_ipv4) vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); - memcpy(header, &vlan, sizeof(vlan)); - header += sizeof(vlan); + memcpy(header, &vlan.hdr, sizeof(struct rte_vlan_hdr)); + header += sizeof(struct rte_vlan_hdr); } if (mplsoudp_encap_conf.select_ipv4) { memcpy(header, &ipv4, sizeof(ipv4)); @@ -8168,15 +8168,15 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token, mplsoudp_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN); memcpy(eth.src.addr_bytes, mplsoudp_encap_conf.eth_src, RTE_ETHER_ADDR_LEN); - memcpy(header, ð, sizeof(eth)); - header += sizeof(eth); + memcpy(header, ð.hdr, sizeof(struct rte_ether_hdr)); + header += sizeof(struct rte_ether_hdr); if (mplsoudp_encap_conf.select_vlan) { if (mplsoudp_encap_conf.select_ipv4) vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); else vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); - memcpy(header, &vlan, sizeof(vlan)); - header += sizeof(vlan); + memcpy(header, &vlan.hdr, sizeof(struct rte_vlan_hdr)); + header += sizeof(struct rte_vlan_hdr); } if (mplsoudp_encap_conf.select_ipv4) { memcpy(header, &ipv4, sizeof(ipv4)); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:42.040054800 +0800 +++ 0128-app-testpmd-fix-encap-decap-size-calculation.patch 2023-04-09 21:45:38.799042200 +0800 @@ -1 +1 @@ -From 7bdf7a13ae34dd9c5d8a6aeef7019003dade6f83 Mon Sep 17 00:00:00 2001 +From 1cbb884f358ba31219bd9e981bc28c5e2bf349c7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7bdf7a13ae34dd9c5d8a6aeef7019003dade6f83 ] @@ -26 +28,0 @@ -Cc: stable@dpdk.org @@ -36 +38 @@ -index 9309607f11..58939ec321 100644 +index 88108498e0..042da57a61 100644 @@ -39 +41 @@ -@@ -8245,15 +8245,15 @@ parse_vc_action_l2_encap(struct context *ctx, const struct token *token, +@@ -7737,15 +7737,15 @@ parse_vc_action_l2_encap(struct context *ctx, const struct token *token, @@ -41 +43 @@ - memcpy(eth.hdr.src_addr.addr_bytes, + memcpy(eth.src.addr_bytes, @@ -49 +51 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); @@ -51 +53 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); @@ -59 +61 @@ -@@ -8301,11 +8301,11 @@ parse_vc_action_l2_decap(struct context *ctx, const struct token *token, +@@ -7793,11 +7793,11 @@ parse_vc_action_l2_decap(struct context *ctx, const struct token *token, @@ -62 +64 @@ - eth.hdr.ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); + eth.type = rte_cpu_to_be_16(RTE_ETHER_TYPE_VLAN); @@ -75 +77 @@ -@@ -8385,15 +8385,15 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, +@@ -7877,15 +7877,15 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token, @@ -77 +79 @@ - memcpy(eth.hdr.src_addr.addr_bytes, + memcpy(eth.src.addr_bytes, @@ -85 +87 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); @@ -87 +89 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); @@ -95 +97 @@ -@@ -8480,15 +8480,15 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token, +@@ -7972,15 +7972,15 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token, @@ -97 +99 @@ - memcpy(eth.hdr.src_addr.addr_bytes, + memcpy(eth.src.addr_bytes, @@ -105 +107 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); @@ -107 +109 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); @@ -115 +117 @@ -@@ -8579,15 +8579,15 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, +@@ -8071,15 +8071,15 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token, @@ -117 +119 @@ - memcpy(eth.hdr.src_addr.addr_bytes, + memcpy(eth.src.addr_bytes, @@ -125 +127 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); @@ -127 +129 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); @@ -135 +137 @@ -@@ -8676,15 +8676,15 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token, +@@ -8168,15 +8168,15 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token, @@ -137 +139 @@ - memcpy(eth.hdr.src_addr.addr_bytes, + memcpy(eth.src.addr_bytes, @@ -145 +147 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); @@ -147 +149 @@ - vlan.hdr.eth_proto = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6); + vlan.inner_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6);