Commit 66bc8e0f authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

iavf: finish renaming files to iavf 



This finishes the process of renaming the files that
make sense to rename (skipping adminq related files that
talk to i40e), and fixes up the build and the #includes
so that everything builds nicely.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 56184e01

drivers/net/ethernet/intel/iavf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ subdir-ccflags-y += -I$(src) 
obj-$(CONFIG_IAVF) += iavf.o



iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o \

	     iavf_txrx.o i40e_common.o i40e_adminq.o iavf_client.o
 
	     iavf_txrx.o iavf_common.o i40e_adminq.o iavf_client.o

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

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

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



#include "i40e_status.h"

#include "i40e_type.h"

#include "i40e_register.h"

#include "iavf_status.h"

#include "iavf_type.h"

#include "iavf_register.h"

#include "i40e_adminq.h"

#include "i40e_prototype.h"

#include "iavf_prototype.h"



/**

 *  i40e_adminq_init_regs - Initialize AdminQ registers

drivers/net/ethernet/intel/iavf/i40e_adminq.h

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#ifndef _IAVF_ADMINQ_H_

#define _IAVF_ADMINQ_H_



#include "i40e_osdep.h"

#include "i40e_status.h"

#include "iavf_osdep.h"

#include "iavf_status.h"

#include "i40e_adminq_cmd.h"



#define IAVF_ADMINQ_DESC(R, i)   \

drivers/net/ethernet/intel/iavf/iavf.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <net/tc_act/tc_gact.h>

#include <net/tc_act/tc_mirred.h>



#include "i40e_type.h"

#include "iavf_type.h"

#include <linux/avf/virtchnl.h>

#include "iavf_txrx.h"
@@ -298,7 +298,7 @@ struct iavf_adapter { 
	struct net_device *netdev;

	struct pci_dev *pdev;



	struct iavf_hw hw; /* defined in i40e_type.h */

	struct iavf_hw hw; /* defined in iavf_type.h */



	enum iavf_state_t state;

	unsigned long crit_section;

CRA Git | Maintained and supported by SUSTech CRA and CCSE