Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136257/?format=api
{ "id": 136257, "url": "http://patches.dpdk.org/api/patches/136257/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240201122922.474250-2-suanmingm@nvidia.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20240201122922.474250-2-suanmingm@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240201122922.474250-2-suanmingm@nvidia.com", "date": "2024-02-01T12:29:20", "name": "[v5,1/3] ethdev: rename action modify field data structure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7844848316edf4098ba0924682aabec7c1bd1be4", "submitter": { "id": 1887, "url": "http://patches.dpdk.org/api/people/1887/?format=api", "name": "Suanming Mou", "email": "suanmingm@nvidia.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240201122922.474250-2-suanmingm@nvidia.com/mbox/", "series": [ { "id": 30965, "url": "http://patches.dpdk.org/api/series/30965/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30965", "date": "2024-02-01T12:29:19", "name": "ethdev: add RTE_FLOW_ITEM_TYPE_COMPARE", "version": 5, "mbox": "http://patches.dpdk.org/series/30965/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/136257/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/136257/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 30D3043A39;\n\tThu, 1 Feb 2024 13:30:12 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1FE9B42E03;\n\tThu, 1 Feb 2024 13:30:12 +0100 (CET)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1nam02on2066.outbound.protection.outlook.com [40.107.96.66])\n by mails.dpdk.org (Postfix) with ESMTP id 64EB64021D\n for <dev@dpdk.org>; Thu, 1 Feb 2024 13:30:10 +0100 (CET)", "from CH2PR07CA0065.namprd07.prod.outlook.com (2603:10b6:610:5b::39)\n by PH7PR12MB5686.namprd12.prod.outlook.com (2603:10b6:510:13d::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.34; Thu, 1 Feb\n 2024 12:30:07 +0000", "from CH2PEPF0000009A.namprd02.prod.outlook.com\n (2603:10b6:610:5b:cafe::63) by CH2PR07CA0065.outlook.office365.com\n (2603:10b6:610:5b::39) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.23 via Frontend\n Transport; Thu, 1 Feb 2024 12:30:06 +0000", "from mail.nvidia.com (216.228.117.160) by\n CH2PEPF0000009A.mail.protection.outlook.com (10.167.244.22) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.7249.19 via Frontend Transport; Thu, 1 Feb 2024 12:30:06 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com\n (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 1 Feb 2024\n 04:29:55 -0800", "from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com\n (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Thu, 1 Feb 2024\n 04:29:48 -0800" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=YcBO5nkq7HQbQ+0mvZJtF20yBo07ZeGwdzmFN3eCA1J0ao/CxXOWw0tAUyMIowpbIQ1AvTo5lU+rxXRnlIjKZ6fM+E8muVtziAgssznxVScW6nHs0rzukbH76mmlXS6ShyhVxgKPlc87pn32QPsO3iXSFbjnn6zBdRkw9Tm9NwtAr3Lz1pxDRuYgB3CNPRnOqXADiBdwiFepS2MxQsMIxFRG/okRrulKKzIob22AaRq3OjSPn72YnkGtTSrVMD17DdLUw9Edm0s63NSMnvh7McYVzXGo4UQU8FrbQYtPC5GSlaXPXQvu5GaeIR2JzMJzdczZ3/R2/DEHkEMaGpBFDQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=OBXshfYT7pz8TB3gOJYd638ZlF2F99xWD+RinIjjIus=;\n b=Q2QjYwqxY/QA8jlwVzrF6pJ67emokxxRiejdhgbYoVghp3lmIgJaSmVotIyNV5wctkJFn0ltcrVUHtUUU2Pyj+H1/TBgbs4xdatFpSOFLTHh6CDHH8gMIq3qwlBNjt42izEfQEUPnTXe5IlNG2UcXiUZHJMyaCtyBEgRNcXQxxUGtxKFL5Ht+AsoYYNPTwT7XwjLYqi9ChPKtMevNf+mcEln5YMPjCQYGPCrmastSORpRYkAFITgAJ4BamSXi5klFlEKheXfQVfaa22tdlWoiwAgmgnD20QWp/5yhvGhsN087q7StyJlhcdhn/VnXWh8705OzfzDaBZTAt72Tjc/IQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none (0)", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=OBXshfYT7pz8TB3gOJYd638ZlF2F99xWD+RinIjjIus=;\n b=sHn3kJvV1vrat0cEhLujTooInrSkcRyHxma8XMCX+jXMhhd5dWzD39ZxoVKilzjCRqZmVRm5kih5UVZS0lPt8UIAOPgw5pALekc2zTD+YAXk06VVlw7NTTao9g758CualM50OC4S+JlqCFRLRQDqM4RKZMLttM1dneSFtn1CsBJYqnQQlYenOuApPibE94QGNWuIVXD7vhDqdLi1seYpQKvNuJzKHRKN4Ps7mzXTKpKIbLVVU3jbl4BVo5Bo9APTTnozAlu170m4KczPI5aiOZOToCe8wdW1mzZvXmE7VtvVhlaixmdeSWdYCZYxiI9XPWzmLYF5wIXdOC6OhbiAFA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.117.160)\n smtp.mailfrom=nvidia.com;\n dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.117.160 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C", "From": "Suanming Mou <suanmingm@nvidia.com>", "To": "<ferruh.yigit@amd.com>, Ori Kam <orika@nvidia.com>, Aman Singh\n <aman.deep.singh@intel.com>, Yuying Zhang <yuying.zhang@intel.com>, \"Dariusz\n Sosnowski\" <dsosnowski@nvidia.com>, Viacheslav Ovsiienko\n <viacheslavo@nvidia.com>, Matan Azrad <matan@nvidia.com>, Thomas Monjalon\n <thomas@monjalon.net>, Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "CC": "<dev@dpdk.org>", "Subject": "[PATCH v5 1/3] ethdev: rename action modify field data structure", "Date": "Thu, 1 Feb 2024 20:29:20 +0800", "Message-ID": "<20240201122922.474250-2-suanmingm@nvidia.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20240201122922.474250-1-suanmingm@nvidia.com>", "References": "<20231214031227.363911-1-suanmingm@nvidia.com>\n <20240201122922.474250-1-suanmingm@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\n rnnvmail201.nvidia.com (10.129.68.8)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "CH2PEPF0000009A:EE_|PH7PR12MB5686:EE_", "X-MS-Office365-Filtering-Correlation-Id": "94888964-ce91-4157-033c-08dc232185e4", "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": "\n F74QGSKTTc3EFJw58YB3xXgs0PX2smgoZ7bMJuWJ8Z23qM28uJqTalV5S+Y6YghRZj3H5UZSPrQpu+vPu++hhbMeN+EhYFNhU4bkoeAH0oDrlgceztAf516sktxCHza9c13m7d2oSPE792XA1NbGtjHw6JwhDHbWnbuGtEyiijkhz/tykw1oAHRlQXsdq6neaNQ9xSYuwfpIikWp8zMrtnUhhwJdXVPhAMxvuTJ2WiJ7hiTZZmy588CjSQQongaeBvRlYdr6ilPAVIuSz0ZYj0JdUnqmigsrOiybvH406/W05hajAXVnHmLhXf7ceauHvzVSKgrCYFd1f0zt9vPP26OJmZplu/GF6NZtEwXOu0hV2xNI65JlI+tTqqegx9M3CM7+IrKrJCFEOIE3ts/ySDPh31apiNFDNmHdZxKddr8JlwAb6limrG1LnXIiBzRAq74KrDIJD/2o0piluBHVLe8MCDjYp6TsJGb3iuTp8XG+nnRfhoRZSpX+pyNhi3/+NDwCMvguEej2FKhrH4ele+un5wBktPY6IXnVv9GuGXVWB1LbcMmVLF4+FDKnNHw/pdvZtdF8D9RyIdfSP85Jrh5NJY0gTiRdPnLAWe+r9rS4mRm6oN8Df+Y/IMV4UNdUshEjGUGjhjx2M3RgjCaU+GL6SowuIKlFXR8LKtAW5j1Hf/Y9mDkwj1DFAE3+vjbZthmLiaU/+94TJLqNoveF7pUUwxzd3AdZZ28bQeWiDq0Nk23P8z3tjU8eqM2ZU+7jm0eL+NEb6SILplySbRxh71cQF+XqclvDb4dAFsbnZWg=", "X-Forefront-Antispam-Report": "CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE;\n SFS:(13230031)(4636009)(346002)(376002)(39860400002)(136003)(396003)(230922051799003)(230173577357003)(230273577357003)(451199024)(1800799012)(186009)(82310400011)(64100799003)(40470700004)(46966006)(36840700001)(426003)(26005)(16526019)(6286002)(336012)(2616005)(1076003)(83380400001)(478600001)(7696005)(41300700001)(6666004)(36756003)(8676002)(8936002)(4326008)(356005)(316002)(55016003)(36860700001)(40480700001)(40460700003)(2906002)(7636003)(5660300002)(70206006)(82740400003)(70586007)(47076005)(110136005)(86362001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "01 Feb 2024 12:30:06.5410 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 94888964-ce91-4157-033c-08dc232185e4", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n CH2PEPF0000009A.namprd02.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR12MB5686", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Current rte_flow_action_modify_data struct describes the pkt\nfield perfectly and is used only in action.\n\nIt is planned to be used for item as well. This commit renames\nit to \"rte_flow_field_data\" making it compatible to be used by item.\n\nSigned-off-by: Suanming Mou <suanmingm@nvidia.com>\nAcked-by: Ori Kam <orika@nvidia.com>\nAcked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n app/test-pmd/cmdline_flow.c | 22 +++++++++++-----------\n doc/guides/prog_guide/rte_flow.rst | 2 +-\n doc/guides/rel_notes/release_24_03.rst | 1 +\n drivers/net/mlx5/mlx5_flow.c | 4 ++--\n drivers/net/mlx5/mlx5_flow.h | 6 +++---\n drivers/net/mlx5/mlx5_flow_dv.c | 10 +++++-----\n lib/ethdev/rte_flow.h | 12 ++++++++----\n 7 files changed, 31 insertions(+), 26 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 359c187b3c..972c6ae490 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -742,13 +742,13 @@ enum index {\n #define ITEM_RAW_SIZE \\\n \t(sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE)\n \n-/** Maximum size for external pattern in struct rte_flow_action_modify_data. */\n-#define ACTION_MODIFY_PATTERN_SIZE 32\n+/** Maximum size for external pattern in struct rte_flow_field_data. */\n+#define FLOW_FIELD_PATTERN_SIZE 32\n \n /** Storage size for struct rte_flow_action_modify_field including pattern. */\n #define ACTION_MODIFY_SIZE \\\n \t(sizeof(struct rte_flow_action_modify_field) + \\\n-\tACTION_MODIFY_PATTERN_SIZE)\n+\tFLOW_FIELD_PATTERN_SIZE)\n \n /** Maximum number of queue indices in struct rte_flow_action_rss. */\n #define ACTION_RSS_QUEUE_NUM 128\n@@ -942,7 +942,7 @@ static const char *const modify_field_ops[] = {\n \t\"set\", \"add\", \"sub\", NULL\n };\n \n-static const char *const modify_field_ids[] = {\n+static const char *const flow_field_ids[] = {\n \t\"start\", \"mac_dst\", \"mac_src\",\n \t\"vlan_type\", \"vlan_id\", \"mac_type\",\n \t\"ipv4_dscp\", \"ipv4_ttl\", \"ipv4_src\", \"ipv4_dst\",\n@@ -6986,7 +6986,7 @@ static const struct token token_list[] = {\n \t\t\t ARGS_ENTRY_ARB(0, 0),\n \t\t\t ARGS_ENTRY_ARB\n \t\t\t\t(sizeof(struct rte_flow_action_modify_field),\n-\t\t\t\t ACTION_MODIFY_PATTERN_SIZE)),\n+\t\t\t\t FLOW_FIELD_PATTERN_SIZE)),\n \t\t.call = parse_vc_conf,\n \t},\n \t[ACTION_MODIFY_FIELD_WIDTH] = {\n@@ -9798,10 +9798,10 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token,\n \tif (ctx->curr != ACTION_MODIFY_FIELD_DST_TYPE_VALUE &&\n \t\tctx->curr != ACTION_MODIFY_FIELD_SRC_TYPE_VALUE)\n \t\treturn -1;\n-\tfor (i = 0; modify_field_ids[i]; ++i)\n-\t\tif (!strcmp_partial(modify_field_ids[i], str, len))\n+\tfor (i = 0; flow_field_ids[i]; ++i)\n+\t\tif (!strcmp_partial(flow_field_ids[i], str, len))\n \t\t\tbreak;\n-\tif (!modify_field_ids[i])\n+\tif (!flow_field_ids[i])\n \t\treturn -1;\n \tif (!ctx->object)\n \t\treturn len;\n@@ -12028,10 +12028,10 @@ comp_set_modify_field_id(struct context *ctx, const struct token *token,\n \n \tRTE_SET_USED(token);\n \tif (!buf)\n-\t\treturn RTE_DIM(modify_field_ids);\n-\tif (ent >= RTE_DIM(modify_field_ids) - 1)\n+\t\treturn RTE_DIM(flow_field_ids);\n+\tif (ent >= RTE_DIM(flow_field_ids) - 1)\n \t\treturn -1;\n-\tname = modify_field_ids[ent];\n+\tname = flow_field_ids[ent];\n \tif (ctx->curr == ACTION_MODIFY_FIELD_SRC_TYPE ||\n \t (strcmp(name, \"pointer\") && strcmp(name, \"value\")))\n \t\treturn strlcpy(buf, name, size);\ndiff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst\nindex 900fdaefb6..f936a9ba19 100644\n--- a/doc/guides/prog_guide/rte_flow.rst\n+++ b/doc/guides/prog_guide/rte_flow.rst\n@@ -3185,7 +3185,7 @@ destination offset as ``48``, and provide immediate value ``0xXXXX85XX``.\n | ``width`` | number of bits to use |\n +---------------+-------------------------+\n \n-.. _table_rte_flow_action_modify_data:\n+.. _table_rte_flow_field_data:\n \n .. table:: destination/source field definition\n \ndiff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst\nindex 84d3144215..efeda6ea97 100644\n--- a/doc/guides/rel_notes/release_24_03.rst\n+++ b/doc/guides/rel_notes/release_24_03.rst\n@@ -124,6 +124,7 @@ ABI Changes\n \n * No ABI change that would break compatibility with 23.11.\n \n+* ethdev: Rename the experimental ``struct rte_flow_action_modify_data`` to be ``struct rte_flow_field_data``\n \n Known Issues\n ------------\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 85e8c77c81..5788a7fb57 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -2493,7 +2493,7 @@ mlx5_validate_action_ct(struct rte_eth_dev *dev,\n * Validate the level value for modify field action.\n *\n * @param[in] data\n- * Pointer to the rte_flow_action_modify_data structure either src or dst.\n+ * Pointer to the rte_flow_field_data structure either src or dst.\n * @param[out] error\n * Pointer to error structure.\n *\n@@ -2501,7 +2501,7 @@ mlx5_validate_action_ct(struct rte_eth_dev *dev,\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n int\n-flow_validate_modify_field_level(const struct rte_flow_action_modify_data *data,\n+flow_validate_modify_field_level(const struct rte_flow_field_data *data,\n \t\t\t\t struct rte_flow_error *error)\n {\n \tif (data->level == 0)\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 6dde9de688..ecfb04ead2 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -1121,7 +1121,7 @@ flow_items_to_tunnel(const struct rte_flow_item items[])\n * Tag array index.\n */\n static inline uint8_t\n-flow_tag_index_get(const struct rte_flow_action_modify_data *data)\n+flow_tag_index_get(const struct rte_flow_field_data *data)\n {\n \treturn data->tag_index ? data->tag_index : data->level;\n }\n@@ -2523,7 +2523,7 @@ int mlx5_flow_validate_action_default_miss(uint64_t action_flags,\n \t\t\t\tconst struct rte_flow_attr *attr,\n \t\t\t\tstruct rte_flow_error *error);\n int flow_validate_modify_field_level\n-\t\t\t(const struct rte_flow_action_modify_data *data,\n+\t\t\t(const struct rte_flow_field_data *data,\n \t\t\t struct rte_flow_error *error);\n int mlx5_flow_item_acceptable(const struct rte_flow_item *item,\n \t\t\t const uint8_t *mask,\n@@ -2828,7 +2828,7 @@ size_t flow_dv_get_item_hdr_len(const enum rte_flow_item_type item_type);\n int flow_dv_convert_encap_data(const struct rte_flow_item *items, uint8_t *buf,\n \t\t\t size_t *size, struct rte_flow_error *error);\n void mlx5_flow_field_id_to_modify_info\n-\t\t(const struct rte_flow_action_modify_data *data,\n+\t\t(const struct rte_flow_field_data *data,\n \t\t struct field_modify_info *info, uint32_t *mask,\n \t\t uint32_t width, struct rte_eth_dev *dev,\n \t\t const struct rte_flow_attr *attr, struct rte_flow_error *error);\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 115d730317..52620be262 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -1441,7 +1441,7 @@ flow_modify_info_mask_32_masked(uint32_t length, uint32_t off, uint32_t post_mas\n }\n \n static __rte_always_inline enum mlx5_modification_field\n-mlx5_mpls_modi_field_get(const struct rte_flow_action_modify_data *data)\n+mlx5_mpls_modi_field_get(const struct rte_flow_field_data *data)\n {\n \treturn MLX5_MODI_IN_MPLS_LABEL_0 + data->tag_index;\n }\n@@ -1449,7 +1449,7 @@ mlx5_mpls_modi_field_get(const struct rte_flow_action_modify_data *data)\n static void\n mlx5_modify_flex_item(const struct rte_eth_dev *dev,\n \t\t const struct mlx5_flex_item *flex,\n-\t\t const struct rte_flow_action_modify_data *data,\n+\t\t const struct rte_flow_field_data *data,\n \t\t struct field_modify_info *info,\n \t\t uint32_t *mask, uint32_t width)\n {\n@@ -1573,7 +1573,7 @@ mlx5_modify_flex_item(const struct rte_eth_dev *dev,\n \n void\n mlx5_flow_field_id_to_modify_info\n-\t\t(const struct rte_flow_action_modify_data *data,\n+\t\t(const struct rte_flow_field_data *data,\n \t\t struct field_modify_info *info, uint32_t *mask,\n \t\t uint32_t width, struct rte_eth_dev *dev,\n \t\t const struct rte_flow_attr *attr, struct rte_flow_error *error)\n@@ -5284,8 +5284,8 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev *dev,\n \tstruct mlx5_sh_config *config = &priv->sh->config;\n \tstruct mlx5_hca_attr *hca_attr = &priv->sh->cdev->config.hca_attr;\n \tconst struct rte_flow_action_modify_field *conf = action->conf;\n-\tconst struct rte_flow_action_modify_data *src_data = &conf->src;\n-\tconst struct rte_flow_action_modify_data *dst_data = &conf->dst;\n+\tconst struct rte_flow_field_data *src_data = &conf->src;\n+\tconst struct rte_flow_field_data *dst_data = &conf->dst;\n \tuint32_t dst_width, src_width, width = conf->width;\n \n \tret = flow_dv_validate_action_modify_hdr(action_flags, action, error);\ndiff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h\nindex 1267c146e5..a143ecb194 100644\n--- a/lib/ethdev/rte_flow.h\n+++ b/lib/ethdev/rte_flow.h\n@@ -3887,6 +3887,8 @@ struct rte_flow_action_ethdev {\n \n /**\n * Field IDs for MODIFY_FIELD action.\n+ * e.g. the packet field IDs used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD\n+ * and RTE_FLOW_ITEM_TYPE_COMPARE.\n */\n enum rte_flow_field_id {\n \tRTE_FLOW_FIELD_START = 0,\t/**< Start of a packet. */\n@@ -3940,9 +3942,11 @@ enum rte_flow_field_id {\n * @warning\n * @b EXPERIMENTAL: this structure may change without prior notice\n *\n- * Field description for MODIFY_FIELD action.\n+ * Field description for packet field.\n+ * e.g. the packet fields used in RTE_FLOW_ACTION_TYPE_MODIFY_FIELD\n+ * and RTE_FLOW_ITEM_TYPE_COMPARE.\n */\n-struct rte_flow_action_modify_data {\n+struct rte_flow_field_data {\n \tenum rte_flow_field_id field; /**< Field or memory type ID. */\n \tunion {\n \t\tstruct {\n@@ -4051,8 +4055,8 @@ enum rte_flow_modify_op {\n */\n struct rte_flow_action_modify_field {\n \tenum rte_flow_modify_op operation; /**< Operation to perform. */\n-\tstruct rte_flow_action_modify_data dst; /**< Destination field. */\n-\tstruct rte_flow_action_modify_data src; /**< Source field. */\n+\tstruct rte_flow_field_data dst; /**< Destination field. */\n+\tstruct rte_flow_field_data src; /**< Source field. */\n \tuint32_t width; /**< Number of bits to use from a source field. */\n };\n \n", "prefixes": [ "v5", "1/3" ] }