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 1C61243B80; Tue, 5 Mar 2024 03:30:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FDE54111C; Tue, 5 Mar 2024 03:29:52 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2134.outbound.protection.outlook.com [40.107.94.134]) by mails.dpdk.org (Postfix) with ESMTP id 4940F406FF for ; Tue, 5 Mar 2024 03:29:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SlgGK6yGsYZiT4DbdQZBBcvkvxc9nRcgKFNOtdGufexFqwkGcSJTDL69GVfar9JyMk8yQ5UR+wPva6d9CpaDBpV49nHZ+F6iQ7ruqdmKrQ+pEIOiIiRInIARdF0MT4o/YoCZOQwi7exDXL9m1o0ByUpKKcUSFpYFpLD1MeWKlTS1DdRsL0AzpmMRFg50dvg3cbk5XEv4nh9QiJZI0PSHBkUFXhD+Z75b/q9DRb4DfaTB+eHvxJl2ivIlOTPYGdX0LFQMDRL8e1K7X69Zuh7/udubLbi1kGD6Tf4B+9RwuWuD00vdnIr5dGveQKcZZM4k7bZ+cS97wss/ojdiF843zw== 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=NTY3xhrxOthZTzmeP1ULD/bo38h3H6/AsHrOEuCLiTs=; b=hMRfPg4zHeA73g9lq4OSpi6vLRrbi/4ZTjnGxctbo94xjI/Imn4MV2I5L+gdc6aBeLQNZdgsZRreoSocYCUC7JzhsIUZmMmdDLeA9CwmC7Ox+aU1+7w/9PImg/L3mht3BFXqE0n1zN9TiCrgXEafaoGEsU00koDAnKaRIVj7c+94DU8xCcIe+ULROs1wgujPIXUxYUDSW5AELsTwbfh+BdW2ovCCTuPaTrosHV5hsAEG3rAmQx4W++yNtOLWEG1g/ic6UkhpjlcbtKEMz+Z9hbdyAiD5CVaXh/m4175adTkXlJ/z3uw7b67V4wVDXcEhvxZM/CI1TQcQtm7V8xBRKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NTY3xhrxOthZTzmeP1ULD/bo38h3H6/AsHrOEuCLiTs=; b=PqTudemnblxtSS6ZGqklk0bcAd1fO2OSttoi9o/Aneq80HrPw1C9/yIPidq4qgmJIXWHue3U1scllaAkl5IFi8g8Qm3EXjdNALGubUPVeL6sQuXsj+HO6CKuA4AVBjmE2OfkBtN30bVuj8SAELhGvFloTdcy9pDpEy8dQ1tDgTE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB5780.namprd13.prod.outlook.com (2603:10b6:510:11b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.37; Tue, 5 Mar 2024 02:29:47 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7339.035; Tue, 5 Mar 2024 02:29:47 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He Subject: [PATCH 3/5] net/nfp: uniform function name format Date: Tue, 5 Mar 2024 10:29:21 +0800 Message-Id: <20240305022923.891544-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240305022923.891544-1-chaoyong.he@corigine.com> References: <20240305022923.891544-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BY5PR04CA0028.namprd04.prod.outlook.com (2603:10b6:a03:1d0::38) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5780:EE_ X-MS-Office365-Filtering-Correlation-Id: adfeaac0-0da1-4e83-c5cc-08dc3cbc2069 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i+a6p895hGfceIc6AiLdpBHFpTyuZ0xVsDcNfXlZcofXohykL8BVm4A/ZA4vldBugr59dwQl6ZaTEp5LcEjmvXJ3uZCVe5AyS+fxgcxZSgz5jLo6xevj+P012MAMhlt9BfNEvd8/zuOTm4OcLHxZOknYTSomUUrDMeHwKfkPyOoCdvy1M1c1BTSHhRu+exuGXU/k/+D0Tb/1wPTYiLmVEEjW8Rh44KJOf9/muF0qLdQpA9t6e5E1a4hTygHQccRVm6bJvdPOqH2aJ2HezemnJiuhU/d35YQPUDqyZrQNAOI7/ba+1atzRis7vjwAz1BnNGEbEu8Y9OA567uFkrqVsdAMPxaFp1HIhMZTGB/e28f3PuU4yf80yD+x6o1BzvGACq/mkchYdgCsEo0ljQ54K0ugQF6nTPH+uSvOa06tg2cCZWHNEjXpDYZetURdkI3aLEjTlDo6UBKi3KC2KiGapUZThJAxyaEVeKJSS1XGhLmiJP3IuyMjJcOYqL4SFXJHLWyywo1qv1mM5m66ZwaBgGFVVa0+xd3D1x9mXVWmHaSLKMODYB6NimXah5/cOmqRl4CjeBXzbgwBvDHr0EnAGKV7UzRRBDBL+plaAgGDF+YxB8GfVxL4nd74xRzOIuOZE9ZAz/BBrn6Cb/rIBgzJbav4xPmsHk/FqOaibxByBHhC5zrpWpum/y12lEKbVBjW+F7gOnMysVmzY8kaZ09gcKT+cec99a14uoOBnQu63aw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kp+FHlAsVG7RN5xWVypDSXQ/7ipjzaH7sVf3OlnOLHUBkT/q3QJMf2ZXVhXC?= =?us-ascii?Q?OYshR8eX5V0SrBT0Ll5zCO2htvBiNene+8KdpMnrMlDYPFTe85L5BhM7lbpG?= =?us-ascii?Q?BAuRIIUYJTnRW5BH1uio8DEbWFd/dvQm3ssiY4rlGAIOSXH1ZDsducnw96PV?= =?us-ascii?Q?D1utxCZqGKhxyWBLbsIr2y+6v3adlIEeDyAzkZPw//itJ2iw6T3gHj34JLc3?= =?us-ascii?Q?I+z5ZPnaFzSNQ9urawOxYtIiVygIsFNUYUu2pRrNeRppkDe6lt1Q55avCOMW?= =?us-ascii?Q?ZkDZAX6z2bbbf40qJVKZ7mDEBlE7fw/lMFZOth1QMSYafXPeU7pXCaI0jmjP?= =?us-ascii?Q?LEw+KO1A2zQqvyMEAgHgDlZ1gKZpIIFBX6hLOwVvQ3szyX3Tncbm2Gdr1SOZ?= =?us-ascii?Q?0YplUWDWcilpW7Cowxz7s1cueX9YVSOZ5ThRAccSZdiO0vGVDfCxznBKDgPE?= =?us-ascii?Q?XhhvQuBnObk2z8JGV+nUAJRIsv9CAAiOmiz+TSwNeVwBikNFyMV6CFrnNh/h?= =?us-ascii?Q?oBHwB/mw2GaTR1MYTzvkZi9eCtA+blD7CACwBrOu4XD52H5RSriEbxPGK7pS?= =?us-ascii?Q?i/Bt5Ov25IH6RfvXlcomTCub4vi39yZfvXgcerse/nFgFatbkM8HB5Z6VRRN?= =?us-ascii?Q?B2ahWpm2CNzKjBGZU9FWIOKqKNu7KID53GfTHT0oUmTx+Un4agwciA9RgDAC?= =?us-ascii?Q?jMFtWVigcdaOD9k2ZVSb5kzPvxGR2lcGD49/vmTIOc6Q3wLiLxdKa3jDCLPy?= =?us-ascii?Q?rIsHvka1fufS7MLF4lklsiK640J936V27SJpe0WCE6CRItxf9zENPGb4ANY5?= =?us-ascii?Q?E8UAjbMOE5QFg0HGau0z2eA+x3PqwblqdYkls5UZKM1vs0ifulKvdidDF657?= =?us-ascii?Q?C0dm9DyE4oXhkZ5XjTao4hJ9wd/TBA81IhNxJ2zHdU4g0AKnc4MyO8nPBK52?= =?us-ascii?Q?dDLplYp+hy8BGpTEqBmPU+NVX1lAV5OV0ngfqKyiEXmmurPCImFvwZhmX7Nj?= =?us-ascii?Q?jzq3U79i51KH/j7I7YJ3QbZnjkB2oMDhjGx8UzEj5FiPFjlWlubEH0z0eHn8?= =?us-ascii?Q?f/4eRnjj68HLh7AbHdHI/G+YjT1CbR96WPQ3yMYJMoWbhW8eTfipkUgkiVWE?= =?us-ascii?Q?p/mAHlJuofXKSkQ6chP6voj6YQCXWqLk2ZhyW9p0YhpxJfxPxKcj2PresRp8?= =?us-ascii?Q?eVmNg3O19wvCV+eYJpSAkboHCEKlgIip/CvO648AmlMsVpYzMjOdu/E1VPTZ?= =?us-ascii?Q?PlwAh3Hupsyaouc2K+c8QD0iysM59n7gJYOJRcai6kYu8lW4TtMhbFxMgREc?= =?us-ascii?Q?BplYHlckKD/SJr2Lt62WhotXoSLLKAy2QsPj/s+Mi9RdAcLqYEOj3587PaGc?= =?us-ascii?Q?qe4+alML0Br7cRvRS0W/CYz6QulJSFjMUQw8xs/NzHpnuOep8+eBAza2gbhO?= =?us-ascii?Q?9jck14Dj5w91yfFpiw46Zxo6rOXSSC+lWuchHEDNdBp2PpsrPjXwNdm73gj0?= =?us-ascii?Q?pGqlmzVayL3iNn2yNNDIngJ+qZAQuVRgUwBa9iU6PEb5s0j7OsESxzzg7bwm?= =?us-ascii?Q?O40CyaJB8rg4sofxwfOgMhjbgsNMdedFWe+jlBf9q3zUFmLbZLFhGgqpL5Bo?= =?us-ascii?Q?QQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: adfeaac0-0da1-4e83-c5cc-08dc3cbc2069 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 02:29:47.7787 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vM9LQDg4Biju4wIy2SPYGJcKy9lygAiAM2gn78uOaHEaqq5GhHm+i+xg1EgimA0AaBoAU4sSA1hmkU2tPJjB+J9I9klqgLLQcQczaxqCV5I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5780 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Long Wu Uniform function name format and add the same prefix. Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 5 ++-- drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 5 ++-- drivers/net/nfp/nfp_net_common.c | 2 +- drivers/net/nfp/nfp_net_meta.c | 38 +++++++++++++++--------------- drivers/net/nfp/nfp_net_meta.h | 8 +++---- drivers/net/nfp/nfp_rxtx.c | 2 +- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index 5fb76ae9d7..7e281ae498 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -194,8 +194,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); return -EINVAL; } - - nfp_net_set_meta_vlan(meta_data, pkt, layer); + nfp_net_meta_set_vlan(meta_data, pkt, layer); vlan_layer++; break; case NFP_NET_META_IPSEC: @@ -204,7 +203,7 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, return -EINVAL; } - nfp_net_set_meta_ipsec(meta_data, txq, pkt, layer, ipsec_layer); + nfp_net_meta_set_ipsec(meta_data, txq, pkt, layer, ipsec_layer); ipsec_layer++; break; default: diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index 8bdab5d463..b8592b1767 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -228,8 +228,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, PMD_DRV_LOG(ERR, "At most 1 layers of vlan is supported"); return -EINVAL; } - - nfp_net_set_meta_vlan(&meta_data, pkt, layer); + nfp_net_meta_set_vlan(&meta_data, pkt, layer); vlan_layer++; break; case NFP_NET_META_IPSEC: @@ -238,7 +237,7 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, return -EINVAL; } - nfp_net_set_meta_ipsec(&meta_data, txq, pkt, layer, ipsec_layer); + nfp_net_meta_set_ipsec(&meta_data, txq, pkt, layer, ipsec_layer); ipsec_layer++; break; default: diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 384e042dfd..71038d6be9 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -1312,7 +1312,7 @@ nfp_net_common_init(struct rte_pci_device *pci_dev, hw->max_mtu = nn_cfg_readl(&hw->super, NFP_NET_CFG_MAX_MTU); hw->flbufsz = DEFAULT_FLBUF_SIZE; - nfp_net_init_metadata_format(hw); + nfp_net_meta_init_format(hw); /* Read the Rx offset configured from firmware */ if (hw->ver.major < 2) diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index 0fd5ba17a0..2ec20aba7d 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -17,7 +17,7 @@ enum nfp_net_meta_ipsec_layer { /* Parse the chained metadata from packet */ static bool -nfp_net_parse_chained_meta(uint8_t *meta_base, +nfp_net_meta_parse_chained(uint8_t *meta_base, rte_be32_t meta_header, struct nfp_net_meta_parsed *meta) { @@ -73,7 +73,7 @@ nfp_net_parse_chained_meta(uint8_t *meta_base, * Get it from metadata area. */ static inline void -nfp_net_parse_single_meta(uint8_t *meta_base, +nfp_net_meta_parse_single(uint8_t *meta_base, rte_be32_t meta_header, struct nfp_net_meta_parsed *meta) { @@ -83,7 +83,7 @@ nfp_net_parse_single_meta(uint8_t *meta_base, /* Set mbuf hash data based on the metadata info */ static void -nfp_net_parse_meta_hash(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_hash(const struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mbuf) { @@ -98,7 +98,7 @@ nfp_net_parse_meta_hash(const struct nfp_net_meta_parsed *meta, /* Set mbuf vlan_strip data based on metadata info */ static void -nfp_net_parse_meta_vlan(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_vlan(const struct nfp_net_meta_parsed *meta, struct nfp_net_rx_desc *rxd, struct nfp_net_rxq *rxq, struct rte_mbuf *mb) @@ -146,7 +146,7 @@ nfp_net_parse_meta_vlan(const struct nfp_net_meta_parsed *meta, * qinq not set & vlan not set: meta->vlan_layer=0 */ static void -nfp_net_parse_meta_qinq(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_qinq(const struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mb) { @@ -175,7 +175,7 @@ nfp_net_parse_meta_qinq(const struct nfp_net_meta_parsed *meta, * Extract and decode metadata info and set the mbuf ol_flags. */ static void -nfp_net_parse_meta_ipsec(struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_ipsec(struct nfp_net_meta_parsed *meta, struct nfp_net_rxq *rxq, struct rte_mbuf *mbuf) { @@ -202,7 +202,7 @@ nfp_net_parse_meta_ipsec(struct nfp_net_meta_parsed *meta, } static void -nfp_net_parse_meta_mark(const struct nfp_net_meta_parsed *meta, +nfp_net_meta_parse_mark(const struct nfp_net_meta_parsed *meta, struct rte_mbuf *mbuf) { if (((meta->flags >> NFP_NET_META_MARK) & 0x1) == 0) @@ -214,7 +214,7 @@ nfp_net_parse_meta_mark(const struct nfp_net_meta_parsed *meta, /* Parse the metadata from packet */ void -nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, +nfp_net_meta_parse(struct nfp_net_rx_desc *rxds, struct nfp_net_rxq *rxq, struct nfp_net_hw *hw, struct rte_mbuf *mb, @@ -231,20 +231,20 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, switch (hw->meta_format) { case NFP_NET_METAFORMAT_CHAINED: - if (nfp_net_parse_chained_meta(meta_base, meta_header, meta)) { - nfp_net_parse_meta_hash(meta, rxq, mb); - nfp_net_parse_meta_vlan(meta, rxds, rxq, mb); - nfp_net_parse_meta_qinq(meta, rxq, mb); - nfp_net_parse_meta_ipsec(meta, rxq, mb); - nfp_net_parse_meta_mark(meta, mb); + if (nfp_net_meta_parse_chained(meta_base, meta_header, meta)) { + nfp_net_meta_parse_hash(meta, rxq, mb); + nfp_net_meta_parse_vlan(meta, rxds, rxq, mb); + nfp_net_meta_parse_qinq(meta, rxq, mb); + nfp_net_meta_parse_ipsec(meta, rxq, mb); + nfp_net_meta_parse_mark(meta, mb); } else { PMD_RX_LOG(DEBUG, "RX chained metadata format is wrong!"); } break; case NFP_NET_METAFORMAT_SINGLE: if ((rxds->rxd.flags & PCIE_DESC_RX_RSS) != 0) { - nfp_net_parse_single_meta(meta_base, meta_header, meta); - nfp_net_parse_meta_hash(meta, rxq, mb); + nfp_net_meta_parse_single(meta_base, meta_header, meta); + nfp_net_meta_parse_hash(meta, rxq, mb); } break; default: @@ -253,7 +253,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, } void -nfp_net_init_metadata_format(struct nfp_net_hw *hw) +nfp_net_meta_init_format(struct nfp_net_hw *hw) { /* * ABI 4.x and ctrl vNIC always use chained metadata, in other cases we allow use of @@ -276,7 +276,7 @@ nfp_net_init_metadata_format(struct nfp_net_hw *hw) } void -nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, +nfp_net_meta_set_vlan(struct nfp_net_meta_raw *meta_data, struct rte_mbuf *pkt, uint8_t layer) { @@ -290,7 +290,7 @@ nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, } void -nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, +nfp_net_meta_set_ipsec(struct nfp_net_meta_raw *meta_data, struct nfp_net_txq *txq, struct rte_mbuf *pkt, uint8_t layer, diff --git a/drivers/net/nfp/nfp_net_meta.h b/drivers/net/nfp/nfp_net_meta.h index 46caa777da..1d26b089d5 100644 --- a/drivers/net/nfp/nfp_net_meta.h +++ b/drivers/net/nfp/nfp_net_meta.h @@ -90,16 +90,16 @@ struct nfp_net_meta_parsed { } vlan[NFP_NET_META_MAX_VLANS]; }; -void nfp_net_init_metadata_format(struct nfp_net_hw *hw); -void nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, +void nfp_net_meta_init_format(struct nfp_net_hw *hw); +void nfp_net_meta_parse(struct nfp_net_rx_desc *rxds, struct nfp_net_rxq *rxq, struct nfp_net_hw *hw, struct rte_mbuf *mb, struct nfp_net_meta_parsed *meta); -void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, +void nfp_net_meta_set_vlan(struct nfp_net_meta_raw *meta_data, struct rte_mbuf *pkt, uint8_t layer); -void nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, +void nfp_net_meta_set_ipsec(struct nfp_net_meta_raw *meta_data, struct nfp_net_txq *txq, struct rte_mbuf *pkt, uint8_t layer, diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index e863c42039..716a6af34f 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -498,7 +498,7 @@ nfp_net_recv_pkts(void *rx_queue, mb->port = rxq->port_id; struct nfp_net_meta_parsed meta = {}; - nfp_net_parse_meta(rxds, rxq, hw, mb, &meta); + nfp_net_meta_parse(rxds, rxq, hw, mb, &meta); nfp_net_parse_ptype(rxq, rxds, mb); -- 2.39.1