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 192B543204; Thu, 26 Oct 2023 08:44:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4DB741140; Thu, 26 Oct 2023 08:43:59 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2118.outbound.protection.outlook.com [40.107.244.118]) by mails.dpdk.org (Postfix) with ESMTP id 911F6402EE for ; Thu, 26 Oct 2023 08:43:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k6lpmfLap4HY3VsBvckWqfgIKInrcubZi3mCk66NWGkc6mK8Y0GOwzS7DFOsDYNqNE357OIvWjbbRoj4kWFxFPNjT2ljgAhK5vhnMBKFFxJAodWEu+Sj5p+HlA/I5zrfkJwqwfO19ukij6BguZYmEDn98I1LD8jwZ+2Bpqd3QAio49iwXGrfotm/pVloPmGYfShfroAnyQawY/Bjt4Vp/DKGzchDhWkNBzVEkwjhA61PjeJ7ACNkaWGA60wClpLlMVgMS9rReKjOiUm9qeBkTniIH+PUta5McdGTyByVn+oPTKE8A0shEtlpLWX0jI1Bskq2e0u9gOXgfdWIhWGBMQ== 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=/3gYkKRKCZO38ayDuATCOXAHxe4M9czHYEA7TYC6Dbc=; b=T0ISz5Scr3HwDlOQoRv9w1tb68hs5cr63nwOSjsuFSyaMh+9EhGdZiURUexMcbQ2U4sWvwtuSH2sFU17ThPfBjfMueTkhOMtxTJItG4BZKk4cbaXKTWHM4BcwKz5Jl/ad902FgSZgjtHluwmjd9VCNcoqlNeIMcaPXfeEYaC1PaBfRSQbRLM3e6QRTRs3CNQ6pwdATcOHu3vRKF70UodTDL6AmSYrhudBdQ4PCDtHWbGzupmyJO1MXRULZFAUJkyZr9XGOs+YYKftTlD9PCo32BR6tNjhEBb4pyGuoqt/Zd1TGdfBl5l11m532LeTool04wQVgdPPxk4fYwu6SI9Fw== 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=/3gYkKRKCZO38ayDuATCOXAHxe4M9czHYEA7TYC6Dbc=; b=IEhjI3IJBnowR1qGIvIb3yBakOA6bw8yLYorZdMcEQ9Ibf4QHKH4KvA1zMnDPj9ySGDjn1CvdyRbI1APutWL5v+tCtn+41doLqgKErG4sXOcFCvZ+8xLkNKJfHKT/yI3KXTSLXtw1RjZ2iJL7GA76yvIo6/UVRafmslgWglIazo= 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 SJ0PR13MB5965.namprd13.prod.outlook.com (2603:10b6:a03:43d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 06:43:51 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Thu, 26 Oct 2023 06:43:51 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v3 04/25] net/nfp: rename ctrl module name Date: Thu, 26 Oct 2023 14:43:03 +0800 Message-Id: <20231026064324.177531-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231026064324.177531-1-chaoyong.he@corigine.com> References: <20231024022849.3092506-1-chaoyong.he@corigine.com> <20231026064324.177531-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR07CA0034.namprd07.prod.outlook.com (2603:10b6:a02:bc::47) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5965:EE_ X-MS-Office365-Filtering-Correlation-Id: 65290f81-66c5-4b7d-8d55-08dbd5eeea62 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ziTSc2Rxn6RiQM3cAeQ+WoEdOYtasOAALebOLlsWPb1Dx4NClwNjazCFEVCDhGes5CiV3VJbjaENVTKtM3NwGvWpL7Q94tKD94e6kYaQV2YaV3RId0Ry04ZNisVNbKvi3MHvJ3sG1ouXVARG1gdWi57NEy2SKPhRHuIRRJ20/TTc2fBoDe4DOjx9eLmLQp6FL7I9KFEbPqVj58bLX6oYky2bqIMKVmiew61i1Rmek+41y6iQL31K4xI0wbmkzktWupiqPG/rF5HH5GGDeQwwBimD4z66q6oaEDsJFBCu8j090ql+x1yRLgaRtOHImpBe6y2UwOpus5r30zVqg+olHLO56Pmh+sMw+qcMVPk2oXYwxU9vi53nio1bKFKKxqA4Ih2XgreJIvoP3VF9jQBiX9OPJdlfhq28KSD6oeq7m0dXCF638W4KNojHoiDNooe7+TFlzOCB0lE8Xvugu1FMFc+PafH3ZrbXdo2UpBoX18R3dLbbgL+hahVWlayt2zDlkjQmj21VeAsCncX+mXoEie2V7w2aXiRu9caR7Y5wfUWMZV/Bjh7RxJYJ5Chz2W+NLmSQiTxwNGGQckxChyZbHQWe3Ji6pDijnUYE3HP6RyfwCidSv6aPHyYIsUcby2ae4to2YcL4VwezYHjgt+wORF2mtcLZulSn0sW8iJO3dk0= 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)(346002)(39830400003)(136003)(366004)(376002)(396003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(478600001)(6506007)(52116002)(2616005)(8676002)(83380400001)(107886003)(41300700001)(26005)(1076003)(6486002)(5660300002)(6666004)(44832011)(6916009)(316002)(66556008)(54906003)(66476007)(66946007)(2906002)(4326008)(8936002)(38350700005)(38100700002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZzXLyemNAAYBcpUfzXTAJ2rR0cuOJdqO+a37GTbcwx4nY+T8fa4New44xxC4?= =?us-ascii?Q?drNCjIP3k2DTiuvP7kh7n4UeU3RopTmm0RS9ALC7vJZO3GXmPdsnrr42jLMe?= =?us-ascii?Q?toDMls8rRbi5yFibZqTn4Gqea6mRziobWOQJr8JXiYU8ZtKp8GdD0YAGMci9?= =?us-ascii?Q?5EWwjBRqJBFT9bGO+EGwrmT92e4NLsNvQIpXXRkj/WxIztlcZnxTsr2MFeVh?= =?us-ascii?Q?Nh9lplUuJA4inbFJ3v6iyA++S77mGQdQZ+PXT+9EdRfOJZ4SnZ4S72PylJn+?= =?us-ascii?Q?lAjbLiO6aRs6ql395xrohgk2xb4JsxlPx04FnvzepA8UxL6Sj7F01yTFA55u?= =?us-ascii?Q?igD6Y5s3kCE9jVtipukwzc4+Es0i3Q3SH6hPMa/hfOmGtgbBv5HfjfeEgTi2?= =?us-ascii?Q?5V/yVYu50OkXzprUpAiyvzIVBt5sGIipeLPEUrvUiEaTJSNI2x0lk5tDRvIL?= =?us-ascii?Q?C9OoSkD+JLwQQ8TbI5CYfeqTQKExiy5VX3lZhqYUasgVdkgj2i0TKadAmJSN?= =?us-ascii?Q?IlJY8Hz8eMsryYnyIUWGNDHlnNB83jvz69LUnwE2PNX82wYxchbhkLxlOZO3?= =?us-ascii?Q?ArgymwMkmK7tS8aq3iTEJd6hUURtKPV2rbH+6jSL6Y9V7r6QsjQT53/0gltP?= =?us-ascii?Q?PgClEv8eNqSC4i51vkNiBwUncUWINHIkcwgL+yvJh3tbbee7KzmtwNQSFNTj?= =?us-ascii?Q?263Onap2CEAKNloVNxn+hvGNOhALxOWabegOmD9krwH7VkRyWjaHsxP3mF8y?= =?us-ascii?Q?a+ABouusfnUZGMGdPMf/aYCTAWqGv5Yi8HKj0Zzhx82hrIYfWP5fJjazBDcM?= =?us-ascii?Q?Xnp01SjeoFq/e2eBK4CIjJGu1+SLL2oJqti6+DF+Ui+vX1DxWe87PfnXtGQ2?= =?us-ascii?Q?XoiCLLN/1kOn081tCZlfWawL0g4HYnrxXmiDbvjRNmVg8/A2ncPSuN+Prx69?= =?us-ascii?Q?i5F9utHjW+vIEhOcMPnkg8uDBEHgPH2sbnpamJ4L2YrOWeOo+5CLrXtlTWEN?= =?us-ascii?Q?ivJFoPso60taSGoKGX2s3B8yTX/rAm5vhQaq+mS+whqOq3qVgUbknEArK+lC?= =?us-ascii?Q?VhfRfF5/pfRT4W6IelavvMX3ZWGt5WrpE0nXelWJ3/WSbCq36oOH2/OeyvDa?= =?us-ascii?Q?+4HseQUdyX1/RyMvHNtkULSKKhxTC8+njUyunKcTXIfqkY6kgD0ogPngiOCx?= =?us-ascii?Q?gy5zgODm6dxSug/09stpDrbCb7ecclsELLZEAi9aIUIIg4vYjVZDuu4gGKDk?= =?us-ascii?Q?YHXM63d6k8u/sIQqsUbvmN1YduVrOUWqKwkbtqhLnKCqCj6oLXlZZyJEtRjz?= =?us-ascii?Q?b8htovFImopWsvdmTTw8RQlScEC4lD+r7UAaOwzMBGYyn/6lV37Vogvj9N+7?= =?us-ascii?Q?niph8xPoaEVPc5VaQBr3VRSzA7jwEKHm/RIaTUnclYWC+efR3dFVqT8GnZJk?= =?us-ascii?Q?gRxo5M3I5KCd8N+wDQcTtmeisVaBxI2bVz+1S+sbxjGHtOi6+zuEWU1jLGsP?= =?us-ascii?Q?Mxp4Iq2v3Pn2DwkEPKo1tLU9+N6BP/d9RKKgkM5cWCof4MPD7pcTU0DLqVyz?= =?us-ascii?Q?YHadeipD51XmrHX3ayOgncoM+jGI0zJMQZWKzs2PO+WiGml7dUNImgwmsYcH?= =?us-ascii?Q?mA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65290f81-66c5-4b7d-8d55-08dbd5eeea62 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 06:43:51.7215 (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: 2UX0CxnOrnbwWkr6Tv2UzEU5KS0NctCXyB4X/i52uvuzGoRB/4qBPxe74GgEyuhPiJBvnQ+NZvb9AmbSBFMzvpC/q9R7wpcIiMULx1KPFCc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5965 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 Rename the 'nfp_ctrl' module into 'nfp_net_ctrl' module, because which is more suitable and we will add 'nfp_common_ctrl' module in the 'drivers/common/nfp' directory. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/meson.build | 2 +- drivers/net/nfp/nfp_ipsec.c | 2 +- drivers/net/nfp/nfp_net_common.h | 2 +- drivers/net/nfp/{nfp_ctrl.c => nfp_net_ctrl.c} | 2 +- drivers/net/nfp/{nfp_ctrl.h => nfp_net_ctrl.h} | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) rename drivers/net/nfp/{nfp_ctrl.c => nfp_net_ctrl.c} (98%) rename drivers/net/nfp/{nfp_ctrl.h => nfp_net_ctrl.h} (99%) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 4b4c587d5d..fa99c3b6aa 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -29,7 +29,6 @@ sources = files( 'nfpcore/nfp_target.c', 'nfpcore/nfp6000_pcie.c', 'nfp_cpp_bridge.c', - 'nfp_ctrl.c', 'nfp_ethdev.c', 'nfp_ethdev_vf.c', 'nfp_flow.c', @@ -37,6 +36,7 @@ sources = files( 'nfp_logs.c', 'nfp_mtr.c', 'nfp_net_common.c', + 'nfp_net_ctrl.c', 'nfp_rxtx.c', ) diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index f137e4b50c..af85e8575c 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -12,9 +12,9 @@ #include #include -#include "nfp_ctrl.h" #include "nfp_logs.h" #include "nfp_net_common.h" +#include "nfp_net_ctrl.h" #include "nfp_rxtx.h" #define NFP_UDP_ESP_PORT 4500 diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index cf08df4618..8a02911c45 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -11,7 +11,7 @@ #include #include -#include "nfp_ctrl.h" +#include "nfp_net_ctrl.h" #include "nfpcore/nfp_dev.h" /* Macros for accessing the Queue Controller Peripheral 'CSRs' */ diff --git a/drivers/net/nfp/nfp_ctrl.c b/drivers/net/nfp/nfp_net_ctrl.c similarity index 98% rename from drivers/net/nfp/nfp_ctrl.c rename to drivers/net/nfp/nfp_net_ctrl.c index a95e35c9a5..b0a427c98e 100644 --- a/drivers/net/nfp/nfp_ctrl.c +++ b/drivers/net/nfp/nfp_net_ctrl.c @@ -3,7 +3,7 @@ * All rights reserved. */ -#include "nfp_ctrl.h" +#include "nfp_net_ctrl.h" #include diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_net_ctrl.h similarity index 99% rename from drivers/net/nfp/nfp_ctrl.h rename to drivers/net/nfp/nfp_net_ctrl.h index 9ec51e0a25..3772b28a66 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_net_ctrl.h @@ -3,8 +3,8 @@ * All rights reserved. */ -#ifndef __NFP_CTRL_H__ -#define __NFP_CTRL_H__ +#ifndef __NFP_NET_CTRL_H__ +#define __NFP_NET_CTRL_H__ #include @@ -571,4 +571,4 @@ nfp_net_cfg_ctrl_rss(uint32_t hw_cap) return NFP_NET_CFG_CTRL_RSS; } -#endif /* __NFP_CTRL_H__ */ +#endif /* __NFP_NET_CTRL_H__ */ -- 2.39.1