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 2A9984320F; Fri, 27 Oct 2023 05:00:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B1E942831; Fri, 27 Oct 2023 05:00:36 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2135.outbound.protection.outlook.com [40.107.220.135]) by mails.dpdk.org (Postfix) with ESMTP id 8E76B42830 for ; Fri, 27 Oct 2023 05:00:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZHdHCIHtRwn/ydtfYsMMEagdTVuENG0PuGPt6fmyOo+WyTM94dWHMC8Bd2FShGa+Q+3BzCAKKsINawOfUJo1UXkU9bilPtyFMxRRz2CtqCeKNQF3MdpFrAUguVJpTz6xIVhJWmmS3vd6OW/ZpvSVzlQi3VysadQZGPuXvWR6sZST4c9y63ewDD5GiYNHEy41MrnMc2yj9fYjQnNu51WZt/LHOWXHI7k2OZmUyg08LELsufdcwSP9J8gCjmLXPdIgxXQjLFBsBi4zGG8MVdyU08i79UmRlJiAs7vW0wo2aFYUOnO5kjsYLFgTgD5w+SvAuNYl8YHPsztFneLrclKp6Q== 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=nGbSc8HrWwNUDb5IElFnGY6hcVrsFT5wLJPF5bhVkyjjZMhFixKlhp34qaGiVnbTISVQhk4nltncz7nW0VxWq2ad5FkjzWINdjQTQDpb0yMaQcBJM3JKfg9KI0Y4l45BBGozxqJsaZIoP8GHF9FnNXZnwo0rpfM8SELW2OrTgaBugZAkE8SAfcCr2B0zE30ZKpwhWOe2rYSsY3CrJ7CgUEFbADRs9fEkSMFWNI8JjQEgbe0tJ9mEzF2FcGLPJT4qqrS+RfN9JzQGyvP028PD8SQyuzH1DYAbwJZfyo5RkuJB+wnsK9qVbC0KW77s/eUpCMlxF9z9PtPyM3JeZrRWhg== 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=vXtRyhYCc+D3vYWZO/oi3efDQjvZx74rsh1F9TOhmEasucS/5QLZBevI4YjvGwG2GlHEiy172c2mqQmhAbi6MI2sESpXCzjnRm0+BJmdso8hBPolFBj/cx7H/uBZWbQPqFmitjcnfptuozMj2uevaujgnurs4aGC7UgWaZ5E7jo= 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 DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Fri, 27 Oct 2023 03:00:31 +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; Fri, 27 Oct 2023 03:00:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH v4 04/24] net/nfp: rename ctrl module Date: Fri, 27 Oct 2023 10:59:41 +0800 Message-Id: <20231027030001.602639-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: 54c48386-33d8-4466-7c58-08dbd698e1d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DRhP9qt4t/+3ETvxlDq8Ac92L5HxrGyBpWIS+dgqqARoChATjzJIZOUw6t24WXhRh57qyxlxLacN6PfUbRJFirmyQJU8MwD4JfgUjTB70IgXhyYbWJDIs2oipbNaQA7hPp4oTreK+e8ZDIJRyKjNFR+57qg7p83W996IjS48DhFS8HRg+lFwbZFLcppat+tN/bki8dCbJ1NAlr/ZSX8BrdFz34oQwQ4iT9MWVNwfRrEEtmDvBDHf2jPCiMNTY5Rob4U5nupXmkBYkxKrmf/flXZqGniqvP4URc/OEgOnY0IQxOfgu/gt/EJ7KA5Lcikl95W0J+GDxQDjWzIzN6I9WI0P/q3xgN0/gm0zI4deweRBmPqGhUv/SxtIz/ySq51AO0aaARWEbVo3CxTYcDAFsPAWGfNKolIS7fqlwT4l2mWGthhzmoWJeLZ4GlZS7XghfJs4hogUvSRK4ZMPKmeomKR3P/QHIw1liGgcz4xWucfPk/KcSD3+FvDoFgntyOCZHQcwGzJFft0ZVazu/11+NmFxoKlVNx+7nvTngNVuqt3VhiSEWarffhQmFzH38uzs6w3mmVAF2pX50T8J3SOQsstjl05q98GGCa8IK9DKrHuN1iK/gl4rvQ6rPy/Ql3DX1ipUVHe8jG9hXZzZUbodNRhaoJyWSo+qqR1QsfJFrxw= 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)(396003)(136003)(366004)(346002)(376002)(39840400004)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(38350700005)(83380400001)(4326008)(52116002)(2906002)(38100700002)(107886003)(44832011)(8936002)(26005)(2616005)(1076003)(36756003)(8676002)(54906003)(6666004)(5660300002)(66476007)(6916009)(6506007)(316002)(6486002)(6512007)(41300700001)(66556008)(66946007)(86362001)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HKkke7GDHnNZE4hbEJZNVYEqmn1nohlyvmjlnx1rqc7ZMYTOucQldjwffFoo?= =?us-ascii?Q?RqEYi4DN9cfGVGm2pHQuZYxtea0QgrtvK+NCUzog3z0M1SFNqHojwfgGNfEr?= =?us-ascii?Q?/KP8ch4S5F97+9dGFTr6323qFzCj2k/Z4Z6QBpXIHPcwtnMLh8n99rkeus6Y?= =?us-ascii?Q?+Ar9g91Ofcj3OxwOa0gJVQGs69BDscKFFL1eb5z4VGjeT3tyEGzOqUj6aC3H?= =?us-ascii?Q?L4d2MfAXwOkXxtjHsZsXdPMncgTRIeqts1nYuT0EDWCxpy6uxik1u9Lsla7U?= =?us-ascii?Q?H5Hy2gsS5JuiwI5pS+cdmvB3XFvCqWDAKTeE9EqO/30bDZiEARrKRZ3Qn105?= =?us-ascii?Q?/WA9v04te0bUnOMYT1Dn4rhOI2c8n9FEEjFUcKeNQ9+/NpIstfo8RuxXipeJ?= =?us-ascii?Q?erFjTfQoP7187avAltdQ2o0+Imp3XS7YSkTra0UWcHEWQLqgeGT2Mh6/voJf?= =?us-ascii?Q?HJ1g/cL1SALEljsKrgAQSbRebHj2FqifsenFw5WgX4uQqNdGEPxxhMO/77vI?= =?us-ascii?Q?Rwd33gN5DhovWId9qKnMWSQT9Kt53GICJWxHgK1H2eSpG9f5dIf7o4UdKYpQ?= =?us-ascii?Q?xRk+wDWbvo4r2pI0JDH7rA6zXKobE5t8LKpP3SPpTsBqmzKf42iuDtsYXNsl?= =?us-ascii?Q?U0cCy/cEBKfkAAQ2MD2Tlz+Nd3mQMbEcGjHKNM7PmU+y8JALC9jWgGhIcoV3?= =?us-ascii?Q?m5b7rbgf9wsB+xLq+fhzHtJbRn+VuqMpAHv6QHpRMX1fS7U4Gx8H4EBVFc1k?= =?us-ascii?Q?7Abqb0/D0YuE3YpvtV3JkmyUaybC5rwtcZZdqz9f0ZgxR3LWnY1CYKy1P9ld?= =?us-ascii?Q?KByGt54FoKzYRXh3xUuueUqplz0Ac835g754dyV5lZOCymTPzYMnCu0Q6mxS?= =?us-ascii?Q?rKhdfdII0cXeJWVO+BEmltOlmDirREaGAVNk35t+8aWrWodDcg8pdg+GyXxv?= =?us-ascii?Q?cX4K4CW33fN5jrf1TxYHJWbZnt3YgHRYfhZ/z9sdiAeUJky21kg6YMQ6GbP/?= =?us-ascii?Q?CFhmz5HDS6A96+MrJDRN2YJUPi6dixbpeIhXRbwyrLG50yNqzi/V6MN+pPBm?= =?us-ascii?Q?BZeoyRvq4s47kMzYTXs4q8VfEp9yAwOKl6e3nG7XzRvF+L9TiavjFacUOXAw?= =?us-ascii?Q?PbnNL/C9QddkHukRl9LuSXziY1bp7aZbBnileJ5I8sQHoxq8cxhOrsh4DgZI?= =?us-ascii?Q?X1D/QDQO6zMqAWd+GbtR2GFTqxn5uyrV1g6i7RpAUvr2lsKmgA7NQ88FnIwr?= =?us-ascii?Q?S22/OrM8SWl2PdwNJ/LYyx8nPb0JFTwxkwk6LtahdDIpiYhXvTk7PB/knXhA?= =?us-ascii?Q?1fN838XFVh5w+85SELWjH1GGwHg7BBp4+lJe1jv5YJGwQtiTivQGdSIN7gGt?= =?us-ascii?Q?LfVZSXjkKaLSNmWDeSgb3YSfJaHAB77VO6wqgWbPz1pKc6JR8xKBf4Yl4fw0?= =?us-ascii?Q?KSQp4ntDLKhWFt24z4nsc9GmiGOD0qPd0/wKjpVKgGcPJMolipWbIftRR5HK?= =?us-ascii?Q?eoG9KD0/JuHXNl3qHn2tSuLyxkwmeuvR90NhRRuhv7zol7msdCb7n2QLGGN+?= =?us-ascii?Q?1IHCUl7txN3YeQmm0oH0IITUwbje7TOCQL3hP5B6CaSGBYBws9Ei17Pnz8b2?= =?us-ascii?Q?gg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54c48386-33d8-4466-7c58-08dbd698e1d0 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:00:31.8179 (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: WfItunkH+VoSHzPDnbfE6hJivUYUZB2tJ/lW3nEyKTeDNH90SrhrwOQTD/mNPQGE3jeyg/0FJZODew9C/jsBfF7Wc8CN84NZTBNCQZFI3Lc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 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