From patchwork Mon Aug 15 07:31:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 115075 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1F7D0A00C3; Mon, 15 Aug 2022 01:26:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 668DC42CCF; Mon, 15 Aug 2022 01:23:36 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 1C12242C4F for ; Mon, 15 Aug 2022 01:23:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660519414; x=1692055414; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QhxPvYoQArXYbBGfrz8QCznVKE4LQ/0SCOc/UXhtaNo=; b=JNmMOe/Df25x6heDOTf1itOxD9SxmfivbGkwi26Gp/xFzhrL4Lu0braW URnI0BfHNt79HD5bzB6lGyF9LpaYm+BR64rqa+rICCDjs1CACUJyQDQUv wRJh5k6Xaw2q1OLpRryMR+1eMOnUC8Q+jmM7TJ9yQjZfp4HynTzOAu3AE jFMGCUBvU/XNXTFbTAsSzf3j8jwLqT3cMNpYU+uEkNdQfBu9Nt5tGrmr7 zM0HIPMsUb6mdJg+Stbrv/jvezq4H3NWtAmV045QE156R49vEkDzp78g8 +MbN985yTWStolT3yDirqq9siKUL+PDaz4ByYShlHH9C44UaEHedJg9Kq Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10439"; a="291858000" X-IronPort-AV: E=Sophos;i="5.93,237,1654585200"; d="scan'208";a="291858000" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2022 16:23:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,237,1654585200"; d="scan'208";a="635283255" Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.4]) by orsmga008.jf.intel.com with ESMTP; 14 Aug 2022 16:23:32 -0700 From: Qi Zhang To: qiming.yang@intel.com Cc: dev@dpdk.org, Qi Zhang , Jacob Keller Subject: [PATCH v2 47/70] net/ice/base: refine header file include Date: Mon, 15 Aug 2022 03:31:43 -0400 Message-Id: <20220815073206.2917968-48-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220815073206.2917968-1-qi.z.zhang@intel.com> References: <20220815071306.2910599-1-qi.z.zhang@intel.com> <20220815073206.2917968-1-qi.z.zhang@intel.com> MIME-Version: 1.0 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 The ice_switch.h and ice_fdir.h headers include ice_common.h. They are both themselves included in ice_common.h. This causes a circular dependency ordering. Signed-off-by: Jacob Keller Signed-off-by: Qi Zhang --- drivers/net/ice/base/ice_fdir.h | 2 +- drivers/net/ice/base/ice_switch.c | 1 + drivers/net/ice/base/ice_switch.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h index 008636072a..d57b1daecd 100644 --- a/drivers/net/ice/base/ice_fdir.h +++ b/drivers/net/ice/base/ice_fdir.h @@ -5,7 +5,7 @@ #ifndef _ICE_FDIR_H_ #define _ICE_FDIR_H_ -#include "ice_common.h" +#include "ice_type.h" #define ICE_FDIR_IP_PROTOCOLS #define ICE_IP_PROTO_TCP 6 diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 6a94e3fde9..6863696d9d 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -2,6 +2,7 @@ * Copyright(c) 2001-2021 Intel Corporation */ +#include "ice_common.h" #include "ice_switch.h" #include "ice_flex_type.h" #include "ice_flow.h" diff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h index ad1397ba5a..3c05a1531f 100644 --- a/drivers/net/ice/base/ice_switch.h +++ b/drivers/net/ice/base/ice_switch.h @@ -5,7 +5,7 @@ #ifndef _ICE_SWITCH_H_ #define _ICE_SWITCH_H_ -#include "ice_common.h" +#include "ice_type.h" #include "ice_protocol_type.h" #define ICE_SW_CFG_MAX_BUF_LEN 2048