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 6104D431EB; Tue, 24 Oct 2023 04:30:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BACB040E78; Tue, 24 Oct 2023 04:29:48 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2102.outbound.protection.outlook.com [40.107.93.102]) by mails.dpdk.org (Postfix) with ESMTP id 3CC3B40A71 for ; Tue, 24 Oct 2023 04:29:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L34hZ3pJKtajpN1b8IhhjkKG8znyBmOYUbUnqbCBZbJ/B4u+NFwMY2IWHZchnry238PKZhKK1pYIWbuvSUYGp+0BwksUUznx/6THY8aw5EdbbKRK+KPXeMGx5CYM8qdpm/6GgNjvvzpZmKYEciBsT9Swn/x96RQCdrE3E+05d9g14R8HLUIjB7OTuczMcjV4m9SexIhAiwDYwjtsuMfM1+h3xFLNp2OZqVdttjE5Z5X8zsNHooXUM2KtABUPcptn9kIjI2TABT7Tzre8qN7js4bZm6dHvEiGzFOeGQEgQZPbTGraycEOjP+fnYoUIi7DJ8CIQtzzxQAxh2/N2mp/CA== 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=d4X/lJS4zCHqyYwFQhGJG3ZRKBInquv1bRtjVCTr/40=; b=oR3OXKLRI8yyi6eGUSXAq09WVZ8W106vwFMtJzVL/hxvy03v1M7oW5yqJW+/mBdEw2VuGL01H3wJxzFHALn+3Zik2RH9p7KAyRm5vQmRNrmzKoRhjaAxGTE+9fyEFy04l/VEkCxb5q8GyEYVPw7bNBzZD8pBJmBCRAWm6JUz4OR/K6/UBBqWy5wbKF8C8earrQS9R4upI4MmgEpbSNHrahD6CYM812xuvCWt2J7DT8IoRJn5ioEKz2K61kTHyckzZApLBkP0xoE/DmwQ6siZ6niIPT5zEGHMuZxzqfgKxLbsOhuQaGDV2bz0fESbEBPVY4kjSPQ1WPf7ySwENjg9YQ== 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=d4X/lJS4zCHqyYwFQhGJG3ZRKBInquv1bRtjVCTr/40=; b=jh+pHoDG8yUEd+Z1z7Ivl0MecRDDjf61KL3lPnmshFEjzaxYjznr2qUNQai6i+skDYfPwROxjeGaeM1emTs/6aLywNEsxKLVwV7suZ7wPgmtpyx8IUncUJxywUNqnqQMzk+L6D6QJP+vPDtUO1KW/Du07Lnc3ahPh1Y7IzaZJbY= 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 BLAPR13MB4691.namprd13.prod.outlook.com (2603:10b6:208:306::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Tue, 24 Oct 2023 02:29:44 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:29:44 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v2 04/25] net/nfp: rename ctrl module name Date: Tue, 24 Oct 2023 10:28:28 +0800 Message-Id: <20231024022849.3092506-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231024022849.3092506-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> <20231024022849.3092506-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4691:EE_ X-MS-Office365-Filtering-Correlation-Id: 582b6104-7562-4c45-95be-08dbd4391595 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JjmG9VCmA23czEWOjeAbrftg4e9VlBza5HySkkKXUpKzo4rygaKehbikdA+awrBVIrnSBMBC2Rh8uRVSpOvL3p5sO6PR4IcFQvcSFm4NmM1APaIG1ptrt053enzmpkIuVGb9F6hFBmGqzr987kSHSBtVcp2RdrsrhcTEWl8bOlSHCOkBI+RDejSS9Jke7KmlLgiHXBX7ZcIA/Kmx53f0dBdZnh6q5dSOVBQ76RuZowBRQ1SXv6dXDlOiwo4chy6vRM/Gsqupo3RjkBJrb5O45Z3wr6uSI1IZB17wRem+cC0rAzcFjJncRXX+buhowrUuKQ6NXOXu3RSbGv6VmQXewu/m+L+rSCxmOb71XOiVqFiM4k5SSHKgJPLu1FQvHFHC2MvPR8tsjA+LsRGkky5kiF1n1d2TZKjOSFDrd8vSbbEnAnjmMCSguSGPb8o45GFRDNVfF/c/Q/a2NpfNbDJfnuu8LohKAK/aKFFk8rO4YyjsGOewpimBxxk3neWxF075AtWpY6aHJhzXmGqOhwfO/HfOvaQ0KE0JGxQ6ZWXoj1eV7Snr9CbfhJ03KTmJiclsghc29ZFrjdVm+ATXoy4YjlmqddAeXDFpOD3ri5nkGKnEH23sxrZLpq2iLBdU4vO919ieIYpWLccyVnF9HMojtgbEqZUGlRM/ZDriAkTvuzs= 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)(39830400003)(366004)(376002)(346002)(396003)(136003)(230922051799003)(186009)(451199024)(1800799009)(64100799003)(83380400001)(38350700005)(2906002)(4326008)(8936002)(36756003)(44832011)(8676002)(26005)(52116002)(107886003)(2616005)(1076003)(38100700002)(6506007)(6666004)(6512007)(316002)(6916009)(478600001)(6486002)(5660300002)(66476007)(86362001)(54906003)(41300700001)(66946007)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?405//21sFUqOmPfjzLQeezwPpT5lcidjqnqogXNbsLi8vB5Rod9VD+qgQk17?= =?us-ascii?Q?cQO3QzUPNY6h/taILbqGM0hwDy5gqJo2HiKzxzPPXuhrhAhfOTJ/porLUeme?= =?us-ascii?Q?LitSh6vPk1EwXnmNNkx4NIwoF8OQ4h/9NwqsxoFjAaZbBXdnbsdA/K7WEDhS?= =?us-ascii?Q?lpelIv1xNHZlRbRi8u/31lGQ1+ABMMRM2Z7qHvoKNjIIYLTuO6YEGby0Tv30?= =?us-ascii?Q?A6Y8uxK3M/faOOPxszqdXnOVkyx+ysiaum4ZM3wHW58mLhUpfflb4IxhDR5E?= =?us-ascii?Q?uVEHmREHpRlKPhZRQ42vn2gwGPPXZQ6sWZsc4LgM/8dmyEqpJuuz8AhZOtw3?= =?us-ascii?Q?k0Ismp30d7h4GhNVZ3JEBSR+5/vnNrJFNmcwcFA5PsKWunRIAT8dZW3/hPUj?= =?us-ascii?Q?ydA9MlrT5fBX6ujLHqwJBOeFKL6I3j8V8T0lVRW2ZFO77ylaCpM7pSkzc+5a?= =?us-ascii?Q?Wf8sCXD8E8Kv/leSevYePPnpk1qRbBM8+x2FsxVdlzyJvchJqVCLEU/BXJLM?= =?us-ascii?Q?E9SSAcHytXkS+JJHfueV882F3KOnHF55dlnojig+w6VL4toB90OYBnV5nQNr?= =?us-ascii?Q?RNkvx3HfTiVqo122Q0A5uq8d214Jw5bdqX05azbRYDB1poqFE1SzLEnPFlUq?= =?us-ascii?Q?3eKJBbAa+TyjpQO8JUjHOzI0JBfqVZyKeqC1JBwPcHADZgTfjsuvWNx1eKdi?= =?us-ascii?Q?vI/UcNBxrIMRumkd61vnbJCnMIdQaWwdPMYkDNh+wNEMn5qUlNDoZwlUL3JQ?= =?us-ascii?Q?9YObiPmgNFz5vwWi48xxjGAB9mLa4UHqAO5iihEHHFuirroZdEabwm0EtHOF?= =?us-ascii?Q?RVt0JKV1GwZtM8LFuKkUGoP1wfm5Nryoi7xNYE9QMFme0Dmt3XKii1mF5ldU?= =?us-ascii?Q?5ziS69unoydLtx53boO5VsTuWIGQPko06tEqAG/xg5DI7LCuEkcj8nvOfSEF?= =?us-ascii?Q?ZXKvRKhLE38w6oAR7Ph5Tp3t+7t1vDL6g/IzCi2NODTHnsSMDmKy5p/Gh/2f?= =?us-ascii?Q?lF/W11wkRhp6Tr+1B2qtqWZLXttiQ9MzVHgeXceK+dkZJ38LiqLpOho9W3CG?= =?us-ascii?Q?tkRi+3joZ80b15wzjDTCW3PbfYdFQl+G6wtkNSPiKcozL04+nDptfGlPga+k?= =?us-ascii?Q?lXhALTuSHfu+mauafD7cQ2CasP9YD12J6+o+lXnc1s2tErh2kmtUAyTuNoZ8?= =?us-ascii?Q?Czl+4/R40FjFti4poGMjjB10RMWydMPftur/lYUi9OgavqIE8XhapnnGhORj?= =?us-ascii?Q?LylnKSsgo1fzgBkbmKrNMZj0Eisql0e2rUVj5XhU/e/XXjPpQbfGW8LwNU/0?= =?us-ascii?Q?S4m8P0yhkatTeD8xVpHpcF+sq3GIYC3HoEtZvNi1cXjWAjveNpF3GoZ4qaOt?= =?us-ascii?Q?dhWHF/RtjOl5oH991TEoekZfRDYceFGtysPLR6ATV4EeDigICRV4MXR6JqNW?= =?us-ascii?Q?86Pb2IPj36VHzqmbC9A5nnjVTFXpok9jueEdqC0qFKQAqd/iT1r+fb84zzxC?= =?us-ascii?Q?YNYAbYGgXHGtkjqlP1gsAQ5/LEBFsQJLXEsQEAljN5vpTDywxxVTX2YX+ayP?= =?us-ascii?Q?dPCpINoUkxNSBvpcmwQKTKsy8JEq/dwAW0jBE19FdtzpUTPrPG4nN8v7bvUC?= =?us-ascii?Q?6Q=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 582b6104-7562-4c45-95be-08dbd4391595 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:29:44.6178 (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: V1dpT6PlA+dyJHKlreNycxCZsRyz4jv0yO/qA1JxbjlAPsZuqBW7gjLmt/KcZgFvLZqEaLGmake7tRGYbOyxIF9Lnu2jDawRBEu0VbRt4xE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4691 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 40748ccc98..d54dca36e9 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