Introduce virt/ directory to collect virtchnl files. We are going to implement a few sizable extensions soon, each of them increasing virt/ size, so it looks sensible to introduce a new dir.
Suggested-by: Jacob Keller <[email protected]> Signed-off-by: Przemek Kitszel <[email protected]> --- drivers/net/ethernet/intel/ice/Makefile | 10 +++++----- drivers/net/ethernet/intel/ice/ice_sriov.h | 4 ++-- drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- .../net/ethernet/intel/ice/{ => virt}/ice_virtchnl.h | 0 .../intel/ice/{ => virt}/ice_virtchnl_allowlist.h | 0 .../ethernet/intel/ice/{ => virt}/ice_virtchnl_fdir.h | 0 .../intel/ice/{ => virt}/ice_virtchnl_queues.h | 0 .../ethernet/intel/ice/{ => virt}/ice_virtchnl_rss.h | 0 drivers/net/ethernet/intel/ice/ice_sriov.c | 2 +- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 2 +- .../net/ethernet/intel/ice/{ => virt}/ice_virtchnl.c | 0 .../intel/ice/{ => virt}/ice_virtchnl_allowlist.c | 0 .../ethernet/intel/ice/{ => virt}/ice_virtchnl_fdir.c | 0 .../intel/ice/{ => virt}/ice_virtchnl_queues.c | 0 .../ethernet/intel/ice/{ => virt}/ice_virtchnl_rss.c | 0 15 files changed, 10 insertions(+), 10 deletions(-) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl.h (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_allowlist.h (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_fdir.h (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_queues.h (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_rss.h (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl.c (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_allowlist.c (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_fdir.c (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_queues.c (100%) rename drivers/net/ethernet/intel/ice/{ => virt}/ice_virtchnl_rss.c (100%) diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile index ccee078931f3..8b58bbbbd363 100644 --- a/drivers/net/ethernet/intel/ice/Makefile +++ b/drivers/net/ethernet/intel/ice/Makefile @@ -47,11 +47,11 @@ ice-y := ice_main.o \ ice_adapter.o ice-$(CONFIG_PCI_IOV) += \ ice_sriov.o \ - ice_virtchnl.o \ - ice_virtchnl_allowlist.o \ - ice_virtchnl_fdir.o \ - ice_virtchnl_queues.o \ - ice_virtchnl_rss.o \ + virt/ice_virtchnl.o \ + virt/ice_virtchnl_allowlist.o \ + virt/ice_virtchnl_fdir.o \ + virt/ice_virtchnl_queues.o \ + virt/ice_virtchnl_rss.o \ ice_vf_mbx.o \ ice_vf_vsi_vlan_ops.o \ ice_vf_lib.o diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.h b/drivers/net/ethernet/intel/ice/ice_sriov.h index d1a998a4bef6..10e5a79e98af 100644 --- a/drivers/net/ethernet/intel/ice/ice_sriov.h +++ b/drivers/net/ethernet/intel/ice/ice_sriov.h @@ -3,9 +3,9 @@ #ifndef _ICE_SRIOV_H_ #define _ICE_SRIOV_H_ -#include "ice_virtchnl_fdir.h" +#include "virt/ice_virtchnl_fdir.h" #include "ice_vf_lib.h" -#include "ice_virtchnl.h" +#include "virt/ice_virtchnl.h" /* Static VF transaction/status register def */ #define VF_DEVICE_STATUS 0xAA diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h index ffe1f9f830ea..97e3e9ccdc1f 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h @@ -13,7 +13,7 @@ #include <linux/avf/virtchnl.h> #include "ice_type.h" #include "ice_flow.h" -#include "ice_virtchnl_fdir.h" +#include "virt/ice_virtchnl_fdir.h" #include "ice_vsi_vlan_ops.h" #define ICE_MAX_SRIOV_VFS 256 diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.h b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl.h similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl.h rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl.h diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.h b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_allowlist.h similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.h rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_allowlist.h diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_fdir.h similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.h rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_fdir.h diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_queues.h b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_queues.h similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_queues.h rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_queues.h diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_rss.h b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_rss.h similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_rss.h rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_rss.h diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c index 9ce4c4db400e..f53080984853 100644 --- a/drivers/net/ethernet/intel/ice/ice_sriov.c +++ b/drivers/net/ethernet/intel/ice/ice_sriov.c @@ -9,7 +9,7 @@ #include "ice_dcb_lib.h" #include "ice_flow.h" #include "ice_eswitch.h" -#include "ice_virtchnl_allowlist.h" +#include "virt/ice_virtchnl_allowlist.h" #include "ice_flex_pipe.h" #include "ice_vf_vsi_vlan_ops.h" #include "ice_vlan.h" diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c index 5ee74f3e82dc..abf69f4be72a 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c @@ -5,7 +5,7 @@ #include "ice.h" #include "ice_lib.h" #include "ice_fltr.h" -#include "ice_virtchnl_allowlist.h" +#include "virt/ice_virtchnl_allowlist.h" /* Public functions which may be accessed by all driver files */ diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl.c similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl.c rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl.c diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_allowlist.c similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_allowlist.c diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_fdir.c similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_fdir.c diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_queues.c b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_queues.c similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_queues.c rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_queues.c diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_rss.c b/drivers/net/ethernet/intel/ice/virt/ice_virtchnl_rss.c similarity index 100% rename from drivers/net/ethernet/intel/ice/ice_virtchnl_rss.c rename to drivers/net/ethernet/intel/ice/virt/ice_virtchnl_rss.c -- 2.39.3
