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 64DFFA00C3; Wed, 7 Dec 2022 03:18:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55DFF41181; Wed, 7 Dec 2022 03:18:18 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2135.outbound.protection.outlook.com [40.107.92.135]) by mails.dpdk.org (Postfix) with ESMTP id 63CA1410D7 for ; Wed, 7 Dec 2022 03:18:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OyOMNjfydy3lbUyryrsKT9ACOAxewOK16xN7o5BG+Xa9hARuCUi+slLT3MYAsr70M7HJHJtcqT9XI7kF5EbgK37cd4UsuBK4UCknFKG1tUI2kLiZDvuEIsDTDYCgQFFfGkiwN7td5xvJn4bNc1yZk+tAfWX+M6pCD70+TBxcpJf4RdKo57N8Er1y7yw7mM6qmvvfh7zoIhTgMPrMkui4hl4tmniim8gUPbZ9axdQs3cwjwoc/pJmZqvdAMzUMIJgYsIX7Bmg8Wzjv32e9dcJhonr66UnAQg214aSp+bw14+YLUh8Ya3wcHLBoqKltqluWiDhzM52w4rNpcI/RBzUVA== 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=ue9zsItum3jHeXfd1+XTOI17WRX080D2T/5BdjEeb5o=; b=hbd99VCjbgRG+qeAmW4PXx7SXuK3YkrhBkNbh/jl0OoPH69aUOPO3bAJhLdnuYxYbT8bhAzC06/Yd1aTgqKnqZuUcgkEIOpgFpV4vNMn/3E/qW7zfXzXM7U33nBwSwMbr9YYIPQ4wsaxgrrQkA+h4Z5cocFOfNJZeMFEIGlk8ryWAgmIvA3yMZd8GhyZHb52Z01QstRwAhQGq6k9Wfx9DYIRptGwR6qHuR8nhvuyN9EnSlfdZenY8dmyShmrIu1oTvwF33QuCgFMdiww6o9pkLhyPd/e2S8F+N7dYnYP4xpc4wNcbW7ViJFp7aeIGcmnbhMupY9IkfEgccjT/dPyDg== 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=ue9zsItum3jHeXfd1+XTOI17WRX080D2T/5BdjEeb5o=; b=i46TaeXVpwX0M5RtsybJGlD34GMSt3ua57eZNzWL7Gbq/SiRagw3wxIQXx5BYACRQxpsBdbFwAP3I+juuz5K4h+LBK85s0FV5VGZx4PDRSUvqVN1Nnt8WnLh85SxfhaetAIcXzzvhWhrX0euIHd7LSDsnMLOMU8++OF8cMfFT40= 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 DM6PR13MB3785.namprd13.prod.outlook.com (2603:10b6:5:244::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Wed, 7 Dec 2022 02:18:13 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7%4]) with mapi id 15.20.5880.014; Wed, 7 Dec 2022 02:18:13 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Jin Liu , Peng Zhang , Chaoyong He Subject: [PATCH 1/6] net/nfp: correct flower cmsg include dependencies Date: Wed, 7 Dec 2022 10:17:43 +0800 Message-Id: <20221207021748.40143-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221207021748.40143-1-chaoyong.he@corigine.com> References: <20221207021748.40143-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: LO6P265CA0021.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ff::14) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3785:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d29b96b-6800-44c8-a71e-08dad7f94ae1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IMbaGh8/L93QgTjv0bXxAB+mbhVcWPJoTgtmoBykMoFR5+2ipOn6pAOWvsZCxWDKsnco4MJiSHht1gsmfQbVQ28nQhUV3mMtKjOfCif1md3nIh/UfDd0ljEEjUJEvbPlD7EoIp7HnoBMPnHt+CYgCBFVxppFbqDQW4p2018k08XovGG9+5IQzeZoRf3Hjl0LuAF/7h93AF4fOe+t2/ZRPKUGWMWdfI1e2hRcKfaRHF5sj0Tz0NwRwo+vNT0HG9npJHpcZmWpWq8y5P8UeGFcSpcJBlQEtPj2N1DjKtrMbLoQdjVLuX1wml65OlFNqK64PNTf0JSUittTegkjKtqTEbaVrqC8GpgydQ/1JqU3CKo7g/XzcJbB9RkdYDNKKAaloMaOmIE3EgfodODRrvlzifxjHDate2GyNAsCfYFUmUuBiRDKl0WVjTd1EqxbhvvD8b2O63j8nKoVLKvXrdvofjMl9oDDc4LVTo2d/6VplG9eRjn1yHd1dtSQfxhBGFI6FwLRkKImJLhUDc+8LCCBJaWBjgY9DpY29OmdFFDtMxlvN6Mx/Kl1Qc8XXqLrxpex9tym0WLZR7zp8cTy/9sqC+mqsQy26yV3yoQuih0Awsp8w7kFmG89U+mTsxPwM+NEOAyUnflflbG28Vd5oXfAkNxSfVtrKh6DQBvtxsVQ8W/DY5zeDDXGjlTQcinBrjS1dbGZ/z9FqO4h8utVIfe3ow== 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:(13230022)(4636009)(39830400003)(396003)(376002)(136003)(366004)(346002)(451199015)(6486002)(478600001)(52116002)(6506007)(36756003)(86362001)(2616005)(26005)(83380400001)(186003)(1076003)(38100700002)(5660300002)(41300700001)(8676002)(38350700002)(6512007)(107886003)(8936002)(6666004)(44832011)(66946007)(66556008)(4326008)(316002)(54906003)(66476007)(6916009)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VTJrdHFUSG1sN2wvNW8yOGJWSWc5dDZXZWplcWRCRG4vTDBqdlFYVXNDbE4r?= =?utf-8?B?SEhOczQ5TVhSWGxDY2s0dVVpbTk5NFRFbEZBd0x6cEZVaCtMeDNUOXRPR0hp?= =?utf-8?B?WGl6WEhzbUpMbDlPUkRlS2dwUS9kdnNiR0ltRGJod0c0a1VaSWNNY1d2ZnZu?= =?utf-8?B?bWhqcVpoblpBMjg3V3ZzdXlib0lybUl3bWVKZzRlbEh0MVV6WXg1QjdKSFIv?= =?utf-8?B?cEEwTjEzT2xCZUJzWWZzWmNzdzUwTUU0a3VDSTZmL1dmYzl5L3YvdEhlbCs4?= =?utf-8?B?SmhJR0U0ZXlCTkcxanc3dkxETmxBSHpmamFTT3lSREF4NmZlRm5Cczg5SEM1?= =?utf-8?B?NEtCZWVjV1VXZjNQaWk0SnhVRjBSTkFhVUxtSzNSQ2ozTlFQWWVwQUVrSTlT?= =?utf-8?B?bDJoOWdwY0VsRXZjZ09FWTdBQ05pRUMwVHd1K0lkSGxzTm1JZmEyZEpGNldY?= =?utf-8?B?WDB0U0djVWxlUmJ2dm9sQzQzSEFMbEJDZzdqTkx3bC9UWE01TFFZQ1ZLUkdj?= =?utf-8?B?d09lSlRDR3JCZ3lkbHk2RHREK1BrZGFFZmJnMDEwS2RjYnNTemw0V1MzOHBH?= =?utf-8?B?R2VQU1M3bDlUTGk1QlFZSkgyMFl2S2UrdWhaMlVrdUtGWHFISXpaNCtmdnlr?= =?utf-8?B?RlBQQkFDL0krcGNxQWE3dnRJdFFzRmlqMUVqMEJsQ1dZNDBiWlljblFSMGVB?= =?utf-8?B?YVdGMVZ6VlJVWnRKbndVcU1sS3B3U1k4aUY0QUpyVG9mV3RkVVZKN3lHdUVy?= =?utf-8?B?ODBJdnpiYkEvNXNLRDVTMDJBdHdIVmpWZEpEQ01NRk9zSlVYM1htQzQ0RTdq?= =?utf-8?B?RmZOU0NuMnlQZld5Ky8vWkVLaE5LWVJ5Vmw1cUY0eW9jYlVuR1hwZ2NJTm5R?= =?utf-8?B?WDE2b1p0WVpab2UvcjVxc0hVdTlxUWJWMzRaMm5XeUt3MEdGcTU5YVh4QXRa?= =?utf-8?B?aHMzVUNSRllMM1lSdFFVOUszWWd6SkdSbjhLNTVNT3BtRkN2QXZpZkYvL3hj?= =?utf-8?B?YmlMQ3dNZDBtQnRMWi8rVE9DQWNQRE1vQi9ZaUROSzEyUnNsZE5ON2NqQ05T?= =?utf-8?B?L2NUOWp3d2J0bUlYNGpReEpjNjBkWUhqWi9nTEtBUUJ3L2x3UUlYelB2QTJ0?= =?utf-8?B?M2VUZjFmbkxzSFc3K0RrMWFPR040RFludVMzR3ZGeVNmaUVaSkthSUpQMDNH?= =?utf-8?B?M0hnUDgwcFlSand4YjVLUmZaS0JtU3d6Sk56Q2RsS0Y2VGJaMVo5NGlWTmZI?= =?utf-8?B?M1ZheHZFTVZRUDVpc01qVXNiUldUN3ZSOElrV0V2ZzkwNXhUMUZNbUhwRGd2?= =?utf-8?B?cmQya2piaG1uMG5kZ3N5V2hZNThTa3VXdU42YWtWSHdWNmtsTWRwb3F5YWl3?= =?utf-8?B?aTU3RGQ3cTVSM2gxVEZaSkJjNnI1aVVuNyt1ODdvRUtsckR3NlFieHF4c3Ex?= =?utf-8?B?K3NzRG1jazFETW9rd2ljV0MwenlwTTFsK3BwRmxPeEYvRG42Y3RGdDJOcWxy?= =?utf-8?B?d2FMMllXb1dEeGUxZGhWWkhWTi9Bdm1yOVg0TjdhSUpJOUU1eDZEV1RFNGky?= =?utf-8?B?RW12MWhPcVo1M3lZUHd6UjBzMUp4TWhlZ1Vud3NyTzFUeE9RTmNUZGlUcHdW?= =?utf-8?B?VDllYnJkcFJHUGZkZHZzZDNaeFkvZmREdWtLZ3FnblhhZG5ZVVFqWlRBbzhM?= =?utf-8?B?R2ZvbGhhbERxMVFDQzZlaEhLWEpWWjdxQTJYWTQzN3FnN0NneUVNT3g1aVNH?= =?utf-8?B?NGpITllIT1RrL0h2bHRRTUljR0JVMmJ5OVZkZGpDN3lXNnJHaGI4Y2VqK25C?= =?utf-8?B?U3Q2RTF3YVk5ZDdqUnV6WDJmN1ZCUmREM2J3akVkcFRrMFFBRU9ZZDRFRzI2?= =?utf-8?B?MkpXY2VaeDViTUl1WjRWRmwyZ3V2VnVJN1dKWlZ0UW0vcFE2N1lOYjRjdlJH?= =?utf-8?B?bWZldEFjVjFRbVpOVm9ab2VCTGQ2VVp2cXB0SVdXN2pDRUhGQjAzek9hbUtO?= =?utf-8?B?K1RRUEJFNFo0S2JYcHozM2dtc2xvNjZJWmlJQ2ZQYnFlQVZKby8yV044L1Ju?= =?utf-8?B?aFV6RFdGaHdkQ2hEQXIvUFpxSWtxUldSanhyTTRPZVpGZzhNaGllcWFmUTVz?= =?utf-8?B?bmFXbm9lM0VBRkRiUlpMZFJwZ01ITzFhcVhzZndpU2huOTN0UFE1MXh0OWJZ?= =?utf-8?B?eVE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d29b96b-6800-44c8-a71e-08dad7f94ae1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2022 02:18:13.3226 (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: hFlhh1OcYksohnTEhkV5l31cFM3V+3iWEyG8SH85v1TPX9QFw6OGTTa9CYv3NLKdjTfpAcfT6VkuHhf+h9UnhvQbQQ3qU9f1UVmNAILarY0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3785 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: Jin Liu The function prototypes in nfp_flower_cmsg.h depends on struct nfp_app_fw_flower defined in nfp_flow.h, but does not include it. Avoid having to include both headers for all users of the flower cmsg helpers by adding the header dependency to the correct header file. Signed-off-by: Jin Liu Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 1 - drivers/net/nfp/flower/nfp_flower_cmsg.c | 1 - drivers/net/nfp/flower/nfp_flower_cmsg.h | 2 ++ drivers/net/nfp/flower/nfp_flower_ctrl.c | 1 - drivers/net/nfp/flower/nfp_flower_representor.c | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index e447258d97..5353daa47d 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -15,7 +15,6 @@ #include "../nfp_ctrl.h" #include "../nfp_cpp_bridge.h" #include "../nfp_rxtx.h" -#include "../nfp_flow.h" #include "../nfpcore/nfp_mip.h" #include "../nfpcore/nfp_rtsym.h" #include "../nfpcore/nfp_nsp.h" diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c index babdd8e36b..f04b9bd921 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.c +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c @@ -6,7 +6,6 @@ #include "../nfpcore/nfp_nsp.h" #include "../nfp_logs.h" #include "../nfp_common.h" -#include "../nfp_flow.h" #include "nfp_flower.h" #include "nfp_flower_cmsg.h" #include "nfp_flower_ctrl.h" diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 04601cb0bd..bdfde70fbe 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -9,6 +9,8 @@ #include #include +#include "../nfp_flow.h" + struct nfp_flower_cmsg_hdr { rte_be16_t pad; uint8_t type; diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 3631e764fe..c545007d0c 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -11,7 +11,6 @@ #include "../nfp_logs.h" #include "../nfp_ctrl.h" #include "../nfp_rxtx.h" -#include "nfp_flow.h" #include "nfp_flower.h" #include "nfp_flower_ctrl.h" #include "nfp_flower_cmsg.h" diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 5809c838b3..76be22efa2 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -10,7 +10,6 @@ #include "../nfp_logs.h" #include "../nfp_ctrl.h" #include "../nfp_rxtx.h" -#include "../nfp_flow.h" #include "../nfpcore/nfp_mip.h" #include "../nfpcore/nfp_rtsym.h" #include "../nfpcore/nfp_nsp.h" -- 2.29.3