From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id E3DABA00C3;
	Mon, 15 Aug 2022 01:07:49 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id BDC9642C6D;
	Mon, 15 Aug 2022 01:04:27 +0200 (CEST)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by mails.dpdk.org (Postfix) with ESMTP id 39ED142C7B
 for <dev@dpdk.org>; Mon, 15 Aug 2022 01:04:24 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
 d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
 t=1660518264; x=1692054264;
 h=from:to:cc:subject:date:message-id:in-reply-to:
 references:mime-version:content-transfer-encoding;
 bh=QhxPvYoQArXYbBGfrz8QCznVKE4LQ/0SCOc/UXhtaNo=;
 b=j4Sj8WfVNXn7aG7+DNKB9ADF7hh/Ju3ri0KyC4ktCD+VnNGFcjfAjebT
 8nC4GBXW5q59Ymx1c5DvX1Fcjo0YciiKKCp+N5AUTHCNtDeA5Ql1nf5LR
 9oNMFGYpRtVbyMu+e8u5DZfYQ3lUAXSGc6ekDgMWAYAzreTZMz6wDlGPa
 2PBrx5+RLGCwMShzAZtWoGsrVDlvHizGn35qc9eRsrYkbPJE5s53fXLri
 5s8IxFJqJWD6EkpgKBucocIOTPguKy/fw7Q69MQBJiSoIpamtEy/Fa9bt
 kNtBpg1AmZgtIpKsFqnBDRM4cHXLxfAHvg3ncexrcB81NHbq2d7mHjwm0 A==;
X-IronPort-AV: E=McAfee;i="6400,9594,10439"; a="289427636"
X-IronPort-AV: E=Sophos;i="5.93,237,1654585200"; d="scan'208";a="289427636"
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
 by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
 14 Aug 2022 16:04:23 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.93,237,1654585200"; d="scan'208";a="934296821"
Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.4])
 by fmsmga005.fm.intel.com with ESMTP; 14 Aug 2022 16:04:22 -0700
From: Qi Zhang <qi.z.zhang@intel.com>
To: qiming.yang@intel.com
Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,
 Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH 47/70] net/ice/base: refine header file include
Date: Mon, 15 Aug 2022 03:12:43 -0400
Message-Id: <20220815071306.2910599-48-qi.z.zhang@intel.com>
X-Mailer: git-send-email 2.31.1
In-Reply-To: <20220815071306.2910599-1-qi.z.zhang@intel.com>
References: <20220815071306.2910599-1-qi.z.zhang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=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 <jacob.e.keller@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 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
-- 
2.31.1