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 003FF457A1 for ; Mon, 12 Aug 2024 14:58:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB758402C3; Mon, 12 Aug 2024 14:58:02 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061.outbound.protection.outlook.com [40.107.223.61]) by mails.dpdk.org (Postfix) with ESMTP id A90354029C for ; Mon, 12 Aug 2024 14:58:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uDL949P6VyWavJiZoG+Y4Rr+VDhtyefG38ZJdlknPD2hpUQkZ0SbJjAqQxuAcxmeuL8tUAhsasXWhr/ZUYUVA8VfaeOxiczgkjeUyUc83xLV1DOWpX4EBL9dg59VAzI7dGCpIEIT/r88Gs37l/fN/lRsA811hqivB+Tl7D+SmUmkrnXKgFXYcvcCcdhNpZsXNAu0HeFjP33rTnxzlPChyZ0DslQg4m9JRUonSx3W25S5TWP2mfM6QvWBOok8jeMyOGQWS401L6cDkFNPnf29vY94XhvpZ5AK/KWn5DnQeCIXdJQhxJPpKPrmKQo2oBLg9qFz1WnbzZmrYLCTT5TNhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=pDDkk17acPz3HN+o9qJhdKQYFF7sOtW+xptX8jAJOkE=; b=VMa0WUDmpHvDcxyiV2mbbcGwg7rUYbDk8QSETLZvgHiTwrPefd5RbutW0oWztXpbSz88M8hRngeWwu3TM+tKF91zQRyzxWVQACDBMyE4DzA7H/aSSvl7HgqFsjA9ydOukBGRca7gdj6+WRGiEOTEq6KXmoP96fh+K/aVggYueIio2FTmXVUKXHlhsbxA62apGL4xq6m0A1yQ8jiGfUC10aSsLzEdFjXuSAU2d+LEPP1o+uejc1re2ThLixDp6Qqvs1wpJgACMf4ZqP6DBKfiLN8dU4yyAMBKX7MyXOodXiz4hpm02uxBjum5jwf/NfB2I64uhafCxvWNJ6ZhdTnztQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.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 (0) 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=pDDkk17acPz3HN+o9qJhdKQYFF7sOtW+xptX8jAJOkE=; b=G8e6kC2uu+7Zpp7WZtEvx4Jy6MgzkDCeS44wjoNagvBK7WrFo0TQQ0aVoxkSC0LayV66s1x3HxtCUqxkn4o/QayF7GpP/RTU2R6whRA1pTT2S2lfrlbk0gnCYNHWxiaPltH9LH7wKoj+kje3fBL9diVRCl+dn3rUmb5vy6gQzE2iAuL9Tp2hKr1NpZaClbfA3dDsM7dKDcPA4Tx01ooF6gkETtvppSABFP1Vbuw6y/tDqf7ElojulCY8FA8QEHTWwNDqI8U5mi7rAyJ/7NO2JfYlCaClla5NXX7AERisIzOrcDZcFWg7Wgp7REQDZXAzTKUklcX0MqFRyDsEujW20g== Received: from SJ0PR13CA0013.namprd13.prod.outlook.com (2603:10b6:a03:2c0::18) by DS0PR12MB9274.namprd12.prod.outlook.com (2603:10b6:8:1a9::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:57:59 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:a03:2c0:cafe::f4) by SJ0PR13CA0013.outlook.office365.com (2603:10b6:a03:2c0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:57:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:57:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:57:34 -0700 Received: from nvidia.com (10.126.231.35) 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.1544.4; Mon, 12 Aug 2024 05:57:32 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/txgbe: fix tunnel packet parsing' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:07 +0800 Message-ID: <20240812125035.389667-71-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AA:EE_|DS0PR12MB9274:EE_ X-MS-Office365-Filtering-Correlation-Id: 9df5869d-01c5-4868-c5b7-08dcbace641b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E29kpGW7cZPPkUBVyC+AkimRJAjFcj/pMoJxe1x7p4jHC3+wnI5pxKUbfpQP?= =?us-ascii?Q?NcfcPK4DLZ4lo1eYBEBbj1k/1uDZRef9lq40jaY++QPJZMvb+UuKrF/To6df?= =?us-ascii?Q?FZreeBaF9TJCZWzdvOZidRjWrXbMBS/xk9KuCGxMNA5rfG1EUZL/3ykwwyH8?= =?us-ascii?Q?SynBxmg8jHLGwnWGv8ytBdXMHSsZkR0WFlH+RmC5qNe8eU2LGsLJsYra8nz9?= =?us-ascii?Q?PF0j/Bc4CSRrxpkwjiDsWqxPTiB6j41ih14zXnbgOh+CezcE9jMpNx/acX9i?= =?us-ascii?Q?UUGdlCVBRW+nQSKRt0NtxtfzNYT2lahbtsva60c6fLf7YR/WYl+sd1GdERo+?= =?us-ascii?Q?d4t61E8jl9CGCt/kf7fwFhBq+tYeg7s9Fn4C7+ewBVxAMCbgAArAwYH1OyRz?= =?us-ascii?Q?Kn2l7P3ju5ovdUXv9ZtXU46DslTkMIoGBF9q0UMJFmjLO1uSHi6ZW0UbW2jF?= =?us-ascii?Q?a63jcV7yW3tSIAvSkEwTk1pLNg6FONgZ+eXn1URwjRvfD5fmM/rJQrcb4bz8?= =?us-ascii?Q?nTAwIG3cW5yUmvq1NRepBFzmMLLzEvxj47DNPvJpMC4YLDq2DRLtsGYDwx0+?= =?us-ascii?Q?LCKcDWrNmOHNHTQOGBvagbXfmQhyC0kFufspUmtZQ31p1VgYT35Vx6VPT8D0?= =?us-ascii?Q?vLv5CO6pWR3phpOomSLWX6zmGYVk5YxZWOUVOx14IMFpCoq6KQWXukFUAvFY?= =?us-ascii?Q?Cp6Ce9TEZ20ZsVJFVlS1ehb7zp9gAH1c8QRx3YTcpIEFkONM4Wl0koDYbpxF?= =?us-ascii?Q?EklbDo0JqNqvjDnmvUMyoB2uANG6FV7lb1Bfo29VeXv2/F6IKL5ky3a58Olc?= =?us-ascii?Q?NChnGm0ZpHisrQ/pZtYd0v83T/JNJ3ayd3SQSkCdNEH8JYHr1VwLyhlx9QUF?= =?us-ascii?Q?cTWynV4DLIEnOomf3OkeK2DS2mrAPUAn/OjrBcSKZDvBzhGeTrpHi9mgLbc8?= =?us-ascii?Q?QpMnqXQG2AwNjBtDLssmBFNgWINiMKoxuZoJ5PJw/bSz18qQN4k1fh8W67Dp?= =?us-ascii?Q?101VliLEO/nFsqbGa1+ijGI1Ac2b8Pwfjv++o1cbgf8a26Wl/L9noiFfekDC?= =?us-ascii?Q?09C2U0xmrlsjlgZ+ppQ8FxuY4/v2UekaY6cUZq6oWlSFyVjsEpLwGtbCRD/N?= =?us-ascii?Q?PEtoxGvW6tY3cien7cxalS1NQw+1FbfmDymQ979p3iRsjY7adwI03/NH6T6E?= =?us-ascii?Q?LMBRmtj4e72Ze1BU9Rm66dhe6lxw68QQib1bwYr02Pp/rbNgn2EpzoYu0IZy?= =?us-ascii?Q?RE4H3xUfgbwlL1MGcEdeqmFJ5tA60RteTSh/z8xG9lnO+0pPKYEQjPlh8o0M?= =?us-ascii?Q?KXRW0jjH1W1CycDnBuODVjb/bBN/6IxayUOkg01PyGeka5XV5LWCLlEce/jO?= =?us-ascii?Q?812ohDx9N3NtU9pnmwrYomczk7GIieVFSz2Khr4JId3OkLj5O5jW6jUJen2Q?= =?us-ascii?Q?C2ydt6vxmbdzJfUI29ypCtuHW/HrcUC5?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:57:58.3463 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9df5869d-01c5-4868-c5b7-08dcbace641b 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9274 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 23.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 08/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=842a7baf9cc6383d17bc54ce861e9475e75a8eb0 Thanks. Xueming Li --- >From 842a7baf9cc6383d17bc54ce861e9475e75a8eb0 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:32 +0800 Subject: [PATCH] net/txgbe: fix tunnel packet parsing Cc: Xueming Li [ upstream commit 60847e50b5280effa6e92a452bbb36fa7051db28 ] The outer-ipv6 tunnel packet was parsed to the wrong packet type, remove the default RTE_PTYPE_L2_ETHER and RTE_PTYPE_L3_IPV4 flags for tunnel packets. And correct the calculation of tunnel length for GRE and GENEVE packets. Fixes: ca46fcd753b1 ("net/txgbe: support Tx with hardware offload") Fixes: e5ece1f467aa ("net/txgbe: fix VXLAN-GPE packet checksum") Fixes: 0e32d6edd479 ("net/txgbe: fix packet type to parse from offload flags") Fixes: 5bbaf75ed6df ("net/txgbe: fix GRE tunnel packet checksum") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_rxtx.c | 69 ++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 1cd4b25965..0e825f89fe 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -564,26 +564,17 @@ tx_desc_ol_flags_to_ptype(uint64_t oflags) switch (oflags & RTE_MBUF_F_TX_TUNNEL_MASK) { case RTE_MBUF_F_TX_TUNNEL_VXLAN: case RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE: - ptype |= RTE_PTYPE_L2_ETHER | - RTE_PTYPE_L3_IPV4 | - RTE_PTYPE_TUNNEL_GRENAT; + ptype |= RTE_PTYPE_TUNNEL_GRENAT; break; case RTE_MBUF_F_TX_TUNNEL_GRE: - ptype |= RTE_PTYPE_L2_ETHER | - RTE_PTYPE_L3_IPV4 | - RTE_PTYPE_TUNNEL_GRE; + ptype |= RTE_PTYPE_TUNNEL_GRE; break; case RTE_MBUF_F_TX_TUNNEL_GENEVE: - ptype |= RTE_PTYPE_L2_ETHER | - RTE_PTYPE_L3_IPV4 | - RTE_PTYPE_TUNNEL_GENEVE; - ptype |= RTE_PTYPE_INNER_L2_ETHER; + ptype |= RTE_PTYPE_TUNNEL_GENEVE; break; case RTE_MBUF_F_TX_TUNNEL_IPIP: case RTE_MBUF_F_TX_TUNNEL_IP: - ptype |= RTE_PTYPE_L2_ETHER | - RTE_PTYPE_L3_IPV4 | - RTE_PTYPE_TUNNEL_IP; + ptype |= RTE_PTYPE_TUNNEL_IP; break; } @@ -667,11 +658,20 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) return 0; } +#define GRE_CHECKSUM_PRESENT 0x8000 +#define GRE_KEY_PRESENT 0x2000 +#define GRE_SEQUENCE_PRESENT 0x1000 +#define GRE_EXT_LEN 4 +#define GRE_SUPPORTED_FIELDS (GRE_CHECKSUM_PRESENT | GRE_KEY_PRESENT |\ + GRE_SEQUENCE_PRESENT) + static inline uint8_t txgbe_get_tun_len(struct rte_mbuf *mbuf) { struct txgbe_genevehdr genevehdr; const struct txgbe_genevehdr *gh; + const struct txgbe_grehdr *grh; + struct txgbe_grehdr grehdr; uint8_t tun_len; switch (mbuf->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) { @@ -684,11 +684,16 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) + sizeof(struct txgbe_vxlanhdr); break; case RTE_MBUF_F_TX_TUNNEL_GRE: - tun_len = sizeof(struct txgbe_nvgrehdr); + tun_len = sizeof(struct txgbe_grehdr); + grh = rte_pktmbuf_read(mbuf, + mbuf->outer_l2_len + mbuf->outer_l3_len, + sizeof(grehdr), &grehdr); + if (grh->flags & rte_cpu_to_be_16(GRE_SUPPORTED_FIELDS)) + tun_len += GRE_EXT_LEN; break; case RTE_MBUF_F_TX_TUNNEL_GENEVE: - gh = rte_pktmbuf_read(mbuf, - mbuf->outer_l2_len + mbuf->outer_l3_len, + gh = rte_pktmbuf_read(mbuf, mbuf->outer_l2_len + + mbuf->outer_l3_len + sizeof(struct txgbe_udphdr), sizeof(genevehdr), &genevehdr); tun_len = sizeof(struct txgbe_udphdr) + sizeof(struct txgbe_genevehdr) @@ -702,27 +707,26 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) } static inline uint8_t -txgbe_parse_tun_ptid(struct rte_mbuf *tx_pkt) +txgbe_parse_tun_ptid(struct rte_mbuf *tx_pkt, uint8_t tun_len) { - uint64_t l2_vxlan, l2_vxlan_mac, l2_vxlan_mac_vlan; - uint64_t l2_gre, l2_gre_mac, l2_gre_mac_vlan; + uint64_t inner_l2_len; uint8_t ptid = 0; - l2_vxlan = sizeof(struct txgbe_udphdr) + sizeof(struct txgbe_vxlanhdr); - l2_vxlan_mac = l2_vxlan + sizeof(struct rte_ether_hdr); - l2_vxlan_mac_vlan = l2_vxlan_mac + sizeof(struct rte_vlan_hdr); + inner_l2_len = tx_pkt->l2_len - tun_len; - l2_gre = sizeof(struct txgbe_grehdr); - l2_gre_mac = l2_gre + sizeof(struct rte_ether_hdr); - l2_gre_mac_vlan = l2_gre_mac + sizeof(struct rte_vlan_hdr); - - if (tx_pkt->l2_len == l2_vxlan || tx_pkt->l2_len == l2_gre) + switch (inner_l2_len) { + case 0: ptid = TXGBE_PTID_TUN_EIG; - else if (tx_pkt->l2_len == l2_vxlan_mac || tx_pkt->l2_len == l2_gre_mac) + break; + case sizeof(struct rte_ether_hdr): ptid = TXGBE_PTID_TUN_EIGM; - else if (tx_pkt->l2_len == l2_vxlan_mac_vlan || - tx_pkt->l2_len == l2_gre_mac_vlan) + break; + case sizeof(struct rte_ether_hdr) + sizeof(struct rte_vlan_hdr): ptid = TXGBE_PTID_TUN_EIGMV; + break; + default: + ptid = TXGBE_PTID_TUN_EI; + } return ptid; } @@ -789,8 +793,6 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, tx_ol_req = ol_flags & TXGBE_TX_OFFLOAD_MASK; if (tx_ol_req) { tx_offload.ptid = tx_desc_ol_flags_to_ptid(tx_ol_req); - if (tx_offload.ptid & TXGBE_PTID_PKT_TUN) - tx_offload.ptid |= txgbe_parse_tun_ptid(tx_pkt); tx_offload.l2_len = tx_pkt->l2_len; tx_offload.l3_len = tx_pkt->l3_len; tx_offload.l4_len = tx_pkt->l4_len; @@ -799,6 +801,9 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, tx_offload.outer_l2_len = tx_pkt->outer_l2_len; tx_offload.outer_l3_len = tx_pkt->outer_l3_len; tx_offload.outer_tun_len = txgbe_get_tun_len(tx_pkt); + if (tx_offload.ptid & TXGBE_PTID_PKT_TUN) + tx_offload.ptid |= txgbe_parse_tun_ptid(tx_pkt, + tx_offload.outer_tun_len); #ifdef RTE_LIB_SECURITY if (use_ipsec) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.829958615 +0800 +++ 0070-net-txgbe-fix-tunnel-packet-parsing.patch 2024-08-12 20:44:02.185069312 +0800 @@ -1 +1 @@ -From 60847e50b5280effa6e92a452bbb36fa7051db28 Mon Sep 17 00:00:00 2001 +From 842a7baf9cc6383d17bc54ce861e9475e75a8eb0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 60847e50b5280effa6e92a452bbb36fa7051db28 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 4b78e68a40..7731ad8491 100644 +index 1cd4b25965..0e825f89fe 100644 @@ -26 +28 @@ -@@ -586,26 +586,17 @@ tx_desc_ol_flags_to_ptype(uint64_t oflags) +@@ -564,26 +564,17 @@ tx_desc_ol_flags_to_ptype(uint64_t oflags) @@ -57 +59 @@ -@@ -689,11 +680,20 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) +@@ -667,11 +658,20 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) @@ -78 +80 @@ -@@ -706,11 +706,16 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) +@@ -684,11 +684,16 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) @@ -98 +100 @@ -@@ -724,27 +729,26 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) +@@ -702,27 +707,26 @@ txgbe_get_tun_len(struct rte_mbuf *mbuf) @@ -139 +141 @@ -@@ -811,8 +815,6 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -789,8 +793,6 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, @@ -148 +150 @@ -@@ -821,6 +823,9 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -799,6 +801,9 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,