Browse Source

iavf: move i40evf files to new name

Simply move the i40evf files to the new name, updating the #includes
to track the new names, and updating the Makefile as well.

A future patch will remove the i40e references (after the code
removal patches later in this series).

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Jesse Brandeburg 7 years ago
parent
commit
5ec8b7d114

+ 2 - 2
drivers/net/ethernet/intel/iavf/Makefile

@@ -11,5 +11,5 @@ subdir-ccflags-y += -I$(src)
 
 obj-$(CONFIG_IAVF) += iavf.o
 
-iavf-objs := i40evf_main.o i40evf_ethtool.o i40evf_virtchnl.o \
-	      i40e_txrx.o i40e_common.o i40e_adminq.o i40evf_client.o
+iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o \
+	     iavf_txrx.o i40e_common.o i40e_adminq.o iavf_client.o

+ 1 - 1
drivers/net/ethernet/intel/iavf/i40evf.h → drivers/net/ethernet/intel/iavf/iavf.h

@@ -36,7 +36,7 @@
 
 #include "i40e_type.h"
 #include <linux/avf/virtchnl.h>
-#include "i40e_txrx.h"
+#include "iavf_txrx.h"
 
 #define DEFAULT_DEBUG_LEVEL_SHIFT 3
 #define PFX "iavf: "

+ 2 - 2
drivers/net/ethernet/intel/iavf/i40evf_client.c → drivers/net/ethernet/intel/iavf/iavf_client.c

@@ -4,9 +4,9 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 
-#include "i40evf.h"
+#include "iavf.h"
 #include "i40e_prototype.h"
-#include "i40evf_client.h"
+#include "iavf_client.h"
 
 static
 const char iavf_client_interface_version_str[] = IAVF_CLIENT_VERSION_STR;

+ 0 - 0
drivers/net/ethernet/intel/iavf/i40evf_client.h → drivers/net/ethernet/intel/iavf/iavf_client.h


+ 1 - 1
drivers/net/ethernet/intel/iavf/i40evf_ethtool.c → drivers/net/ethernet/intel/iavf/iavf_ethtool.c

@@ -2,7 +2,7 @@
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
 /* ethtool support for iavf */
-#include "i40evf.h"
+#include "iavf.h"
 
 #include <linux/uaccess.h>
 

+ 2 - 2
drivers/net/ethernet/intel/iavf/i40evf_main.c → drivers/net/ethernet/intel/iavf/iavf_main.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
-#include "i40evf.h"
+#include "iavf.h"
 #include "i40e_prototype.h"
-#include "i40evf_client.h"
+#include "iavf_client.h"
 /* All iavf tracepoints are defined by the include below, which must
  * be included exactly once across the whole kernel with
  * CREATE_TRACE_POINTS defined

+ 1 - 1
drivers/net/ethernet/intel/iavf/i40e_txrx.c → drivers/net/ethernet/intel/iavf/iavf_txrx.c

@@ -4,7 +4,7 @@
 #include <linux/prefetch.h>
 #include <net/busy_poll.h>
 
-#include "i40evf.h"
+#include "iavf.h"
 #include "i40e_trace.h"
 #include "i40e_prototype.h"
 

+ 0 - 0
drivers/net/ethernet/intel/iavf/i40e_txrx.h → drivers/net/ethernet/intel/iavf/iavf_txrx.h


+ 2 - 2
drivers/net/ethernet/intel/iavf/i40evf_virtchnl.c → drivers/net/ethernet/intel/iavf/iavf_virtchnl.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
-#include "i40evf.h"
+#include "iavf.h"
 #include "i40e_prototype.h"
-#include "i40evf_client.h"
+#include "iavf_client.h"
 
 /* busy wait delay in msec */
 #define IAVF_BUSY_WAIT_DELAY 10