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 43FC541D8D for ; Mon, 27 Feb 2023 08:10:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3EC8840A84; Mon, 27 Feb 2023 08:10:58 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2086.outbound.protection.outlook.com [40.107.94.86]) by mails.dpdk.org (Postfix) with ESMTP id 351B240A7D for ; Mon, 27 Feb 2023 08:10:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y/yZGK47gQCbWDnpzzW955DA1BGhq9kDoAZAM2JdPHG/nBNEL+ZqGm3hDBA2nWMOehvDE9T+TVCVeTvAB9+kTl6/7xdLrr/igeu0Qu4nJCvB0919hb6ofYRmUF9WwByvqGBmvrkFWM/JvEd0aD1q6KA7jPbbG070oz6hwmT7hCWrI3nvBRc17X5aaGZKWfNKf92BdRF5gg/nuHJob5lWZ0Uy+QTfmFCDHgmPmQb5NGRjXYyO7OI5nlgKIwan1XVpuFfFU0kCVGB3zibASnIwHp6IVhrDq93a15MhA5DR/OInkdM4k/0WyWXyzAXTwakGICC+kgcKnHZtPLE6x4+Q1w== 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=/l6PNFiEhbpsjWPUNjb5Itxfjc+JkC5LCXPYMjC5Ge4=; b=RGkA3BHXKQc4sVxG1XsN2xZWMa5zLTPTACXhu/XDRstyBYHCQiquD6AnYRVEF55SO95nebY2oSfjJzI8eZYaYgq1iCcMTcnBQpEVZWvcwm3Gj8Mg0AWxN8echt7jEQG+TLfrT1dJxEXPRorGkNkbVrpdMI/5X2cqn9xotpmCn/bcgVVoksdttWohyUyg6c8p5kPWlrcLyjQAMm6vfqRXoPJUXrBzKBtS7ax5swtWjGP7wiPBj9ATwM//6+Ik/ePyh0icbhRzrJWI5cA+xNnZG0gs2QNjLUyEmnJ61H32NCwflDORVDKdCvQIG5ZolV6cm1IpIU3IpABixlPDKhrMwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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=/l6PNFiEhbpsjWPUNjb5Itxfjc+JkC5LCXPYMjC5Ge4=; b=rL/vthmq7cekRPIzeWjZwgK7tGAYa/IMEcFLCZm7Gej7iR0MJuURBZ4ZJPXFp9f3uv0c1RxOb8XhiDLYfTpAe0HVXJXRZjQcK735wkIo1vznXF2X53exR9SDuDrfcI3U90UgreGOGlKV95pD0ALsngOAACDJ9vUyuGmduuzgrSRgggLhKZvBJnZh1xlrggB23O2ERzZkwoaCj9llJqGp3YZ59rZJ0AEjlRYlGY+ys0o7flpVZmcCJTOCGylrlMM/a0dSeLovTK7dpsPr2ZGPUSnrnYFuDblz8t6gEBAAZDpqyzDZywZ7VtCsOhkzQjW0KFDMKvyHqk+Z/a6jxxdKUA== Received: from DS7PR06CA0029.namprd06.prod.outlook.com (2603:10b6:8:54::29) by DS7PR12MB5720.namprd12.prod.outlook.com (2603:10b6:8:73::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:10:53 +0000 Received: from DM6NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:8:54:cafe::1c) by DS7PR06CA0029.outlook.office365.com (2603:10b6:8:54::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:10:53 +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 DM6NAM11FT041.mail.protection.outlook.com (10.13.172.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.24 via Frontend Transport; Mon, 27 Feb 2023 07:10:52 +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.986.36; Sun, 26 Feb 2023 23:10:39 -0800 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, 26 Feb 2023 23:10:36 -0800 From: Xueming Li To: Thomas Monjalon CC: Ferruh Yigit , Andrew Rybchenko , Chengwen Feng , dpdk stable Subject: patch 'doc: fix description of L2TPV2 flow item' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:57 +0800 Message-ID: <20230227070107.15664-89-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT041:EE_|DS7PR12MB5720:EE_ X-MS-Office365-Filtering-Correlation-Id: 4da75575-5b4d-4eed-b6e3-08db1891c348 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xpoyOr/eFdO4aPZZ88oS9LdWO3GB0Uh9KplPXqFnXRd7F8DyJXfpEMGLubZF89bOtjAbWY5Xemdc39thAVqP34ZtMA7UkULNR+Y6AN2sYkDs5megefvLlodcd7wi9JhbvQDk/RfxP8g/05266FMWuHoSiAh8R0DYqvKiEBv29DNgZEeVt8xMxMUkULC78SHRi3ZK8L8vajCcE0uBRFrO3HFsqB+epxNYAQo6VoBdZtkvZLow+6dVBvn8hgJnoLDl5dY4j43E8YmDkAsk+7h9ZH0vxeLTtWepo5FOpUeEKRJPA5cjK0r+jufGmoF8zPlJ0XNBef6WTxg+z+lq0RIf/UAAZDot6/IldejGUjSa9B5JKFw4UXZX2plEMFSA4cKfXz3h8UiFcl9QTl66XsoOw56uURYU83nlXG9uFc/1RRHaUBSq+2IiGErjVPO7dN0x292eNdAVwOBFcYrjEuGMwFWLgWRXpugzfsWGXx7e/9KitBOf7M+wIta4oQG38GePgbFzBXbRUNuwc+dDaTlfXHgbEkNMzC0Xbvurpe8LNX7mYE7MKu1CNXxkAIb+c/D32CtYcCf+zct8sd2XDykiJerfnMnyJOiw3oFgeIdVGNnHLzTR7P8RC+n2J5E74scxosqbZaslBStLa8rlLmGJ2Dv2A/RyrWzLWIV3IE+0D3+pQWOV6uFAbOERN8DDVGuI+snrpS/mLK9H4JLHal1adwpsJNCgN6yp0JJopo3gN40ztwsR8bvFW0RVsKh0MYu/uDMG72gJqZD372+YrQzU+338c1InONEcivyr2mBiSsVV+UvkH0yk3S83Fzv3U/e0 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:(13230025)(4636009)(346002)(376002)(396003)(39860400002)(136003)(451199018)(36840700001)(46966006)(40470700004)(336012)(47076005)(426003)(316002)(54906003)(36756003)(40460700003)(86362001)(55016003)(40480700001)(356005)(82740400003)(7636003)(36860700001)(34020700004)(82310400005)(1076003)(6666004)(53546011)(83380400001)(16526019)(186003)(26005)(6286002)(2616005)(5660300002)(8936002)(7696005)(2906002)(966005)(478600001)(41300700001)(4326008)(6916009)(8676002)(70206006)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:10:52.7141 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4da75575-5b4d-4eed-b6e3-08db1891c348 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: DM6NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5720 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 03/01/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/commit/?h=22.11-staging&id=8eefe1d245d757bdea432ca52ef5d6e38dc8c079 Thanks. Xueming Li --- >From 8eefe1d245d757bdea432ca52ef5d6e38dc8c079 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 25 Oct 2022 23:44:09 +0200 Subject: [PATCH] doc: fix description of L2TPV2 flow item Cc: Xueming Li [ upstream commit a7d0dd8693417fbecb0debe7b4aec96dbafed51a ] The flow item structure includes the protocol definition from the directory lib/net/, so it is reflected in the guide. Section title underlining is also fixed around. Fixes: 3a929df1f286 ("ethdev: support L2TPv2 and PPP procotol") Signed-off-by: Thomas Monjalon Acked-by: Ferruh Yigit Acked-by: Andrew Rybchenko Acked-by: Chengwen Feng --- doc/guides/prog_guide/rte_flow.rst | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 3e6242803d..40d3f5bd44 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1513,22 +1513,15 @@ rte_flow_flex_item_create() routine. value and mask. Item: ``L2TPV2`` -^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^ Matches a L2TPv2 header. -- ``flags_version``: flags(12b), version(4b). -- ``length``: total length of the message. -- ``tunnel_id``: identifier for the control connection. -- ``session_id``: identifier for a session within a tunnel. -- ``ns``: sequence number for this date or control message. -- ``nr``: sequence number expected in the next control message to be received. -- ``offset_size``: offset of payload data. -- ``offset_padding``: offset padding, variable length. +- ``hdr``: header definition (``rte_l2tpv2.h``). - Default ``mask`` matches flags_version only. Item: ``PPP`` -^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^ Matches a PPP header. -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.770334600 +0800 +++ 0090-doc-fix-description-of-L2TPV2-flow-item.patch 2023-02-27 14:08:40.819237000 +0800 @@ -1 +1 @@ -From a7d0dd8693417fbecb0debe7b4aec96dbafed51a Mon Sep 17 00:00:00 2001 +From 8eefe1d245d757bdea432ca52ef5d6e38dc8c079 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a7d0dd8693417fbecb0debe7b4aec96dbafed51a ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 59dfec1139..e465662da3 100644 +index 3e6242803d..40d3f5bd44 100644 @@ -26 +28 @@ -@@ -1498,22 +1498,15 @@ rte_flow_flex_item_create() routine. +@@ -1513,22 +1513,15 @@ rte_flow_flex_item_create() routine.