Commit 56df3459 authored by Ivan Vecera's avatar Ivan Vecera Committed by Tony Nguyen
Browse files

i40e: Remove circular header dependencies and fix headers 



Similarly as for ice driver [1] there are also circular header
dependencies in i40e driver:
i40e.h -> i40e_virtchnl_pf.h -> i40e.h

Another issue is that i40e header files does not contain their own
dependencies on other header files (both private and standard) so their
inclusion in .c file require to add these deps in certain order to
that .c file to make it compilable.

Fix both issues by removal the mentioned circular dependency, by filling
i40e headers with their dependencies so they can be placed anywhere in
a source code. Additionally remove bunch of includes from i40e.h super
header file that are not necessary and include i40e.h only in .c files
that really require it.

[1] 649c87c6 ("ice: remove circular header dependencies on ice.h")

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 5dfd37c3

drivers/net/ethernet/intel/i40e/i40e.h

+8 −35
Original line number Diff line number Diff line
@@ -4,47 +4,20 @@ 
#ifndef _I40E_H_

#define _I40E_H_



#include <net/tcp.h>

#include <net/udp.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/netdevice.h>

#include <linux/ioport.h>

#include <linux/iommu.h>

#include <linux/slab.h>

#include <linux/list.h>

#include <linux/hashtable.h>

#include <linux/string.h>

#include <linux/in.h>

#include <linux/ip.h>

#include <linux/sctp.h>

#include <linux/pkt_sched.h>

#include <linux/ipv6.h>

#include <net/checksum.h>

#include <net/ip6_checksum.h>

#include <linux/ethtool.h>

#include <linux/if_vlan.h>

#include <linux/if_macvlan.h>

#include <linux/if_bridge.h>

#include <linux/clocksource.h>

#include <linux/net_tstamp.h>

#include <linux/pci.h>

#include <linux/ptp_clock_kernel.h>

#include <linux/types.h>

#include <linux/avf/virtchnl.h>

#include <linux/net/intel/i40e_client.h>

#include <net/pkt_cls.h>

#include <net/pkt_sched.h>

#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>

#include <net/udp_tunnel.h>

#include <net/xdp_sock.h>

#include <linux/bitfield.h>

#include "i40e_type.h"

#include "i40e_dcb.h"

#include "i40e_debug.h"

#include "i40e_io.h"

#include "i40e_prototype.h"

#include <linux/net/intel/i40e_client.h>

#include <linux/avf/virtchnl.h>

#include "i40e_virtchnl_pf.h"

#include "i40e_register.h"

#include "i40e_txrx.h"

#include "i40e_dcb.h"



/* Useful i40e defaults */

#define I40E_MAX_VEB			16

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2018 Intel Corporation. */



#include "i40e_type.h"

#include <linux/delay.h>

#include "i40e_alloc.h"

#include "i40e_register.h"

#include "i40e_adminq.h"

#include "i40e_prototype.h"



static void i40e_resume_aq(struct i40e_hw *hw);

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#ifndef _I40E_ADMINQ_CMD_H_

#define _I40E_ADMINQ_CMD_H_



#include <linux/bits.h>



/* This header file defines the i40e Admin Queue commands and is shared between

 * i40e Firmware and Software.

 *

drivers/net/ethernet/intel/i40e/i40e_client.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/net/intel/i40e_client.h>



#include "i40e.h"

#include "i40e_prototype.h"



static LIST_HEAD(i40e_devices);

static DEFINE_MUTEX(i40e_device_mutex);

drivers/net/ethernet/intel/i40e/i40e_common.c

+7 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2013 - 2021 Intel Corporation. */



#include "i40e.h"

#include "i40e_type.h"

#include "i40e_adminq.h"

#include "i40e_prototype.h"

#include <linux/avf/virtchnl.h>

#include <linux/delay.h>

#include <linux/etherdevice.h>

#include <linux/pci.h>

#include "i40e_adminq_cmd.h"

#include "i40e_devids.h"

#include "i40e_prototype.h"

#include "i40e_register.h"



/**

 * i40e_set_mac_type - Sets MAC type