Only moving whole files, fixing Makefile and bunch of includes.
Some changes to ice_devlink file was done even in representor part (Tx
topology), so keep it as final patch to not mess up with rebasing.
Reviewed-by: Wojciech Drewek <wojciech.dre...@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>
---
drivers/net/ethernet/intel/ice/Makefile | 2 +-
drivers/net/ethernet/intel/ice/{ => devlink}/ice_devlink.c | 0
drivers/net/ethernet/intel/ice/{ => devlink}/ice_devlink.h | 0
drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 2 +-
drivers/net/ethernet/intel/ice/ice_eswitch.c | 2 +-
drivers/net/ethernet/intel/ice/ice_main.c | 2 +-
drivers/net/ethernet/intel/ice/ice_repr.c | 2 +-
drivers/net/ethernet/intel/ice/ice_sf_eth.c | 2 +-
8 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/net/ethernet/intel/ice/{ => devlink}/ice_devlink.c (100%)
rename drivers/net/ethernet/intel/ice/{ => devlink}/ice_devlink.h (100%)
diff --git a/drivers/net/ethernet/intel/ice/Makefile
b/drivers/net/ethernet/intel/ice/Makefile
index 6f350d8624d7..895cec763637 100644
--- a/drivers/net/ethernet/intel/ice/Makefile
+++ b/drivers/net/ethernet/intel/ice/Makefile
@@ -29,7 +29,7 @@ ice-y := ice_main.o \
ice_flex_pipe.o \
ice_flow.o \
ice_idc.o \
- ice_devlink.o \
+ devlink/ice_devlink.o \
devlink/ice_devlink_port.o \
ice_sf_eth.o \
ice_sf_vsi_vlan_ops.o \
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c
b/drivers/net/ethernet/intel/ice/devlink/ice_devlink.c
similarity index 100%
rename from drivers/net/ethernet/intel/ice/ice_devlink.c
rename to drivers/net/ethernet/intel/ice/devlink/ice_devlink.c
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.h
b/drivers/net/ethernet/intel/ice/devlink/ice_devlink.h
similarity index 100%
rename from drivers/net/ethernet/intel/ice/ice_devlink.h
rename to drivers/net/ethernet/intel/ice/devlink/ice_devlink.h
diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
index 63ce4920de4e..3f6661390151 100644
--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
@@ -3,7 +3,7 @@
#include "ice_dcb_lib.h"
#include "ice_dcb_nl.h"
-#include "ice_devlink.h"
+#include "devlink/ice_devlink.h"
/**
* ice_dcb_get_ena_tc - return bitmap of enabled TCs
diff --git a/drivers/net/ethernet/intel/ice/ice_eswitch.c
b/drivers/net/ethernet/intel/ice/ice_eswitch.c
index 50985a3732c0..416728d0674f 100644
--- a/drivers/net/ethernet/intel/ice/ice_eswitch.c
+++ b/drivers/net/ethernet/intel/ice/ice_eswitch.c
@@ -7,7 +7,7 @@
#include "ice_eswitch_br.h"
#include "ice_fltr.h"
#include "ice_repr.h"
-#include "ice_devlink.h"
+#include "devlink/ice_devlink.h"
#include "ice_tc_lib.h"
/**
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c
b/drivers/net/ethernet/intel/ice/ice_main.c
index 7ff96da33e8d..5129bce8538a 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -13,7 +13,7 @@
#include "ice_fltr.h"
#include "ice_dcb_lib.h"
#include "ice_dcb_nl.h"
-#include "ice_devlink.h"
+#include "devlink/ice_devlink.h"
#include "ice_hwmon.h"
#include "devlink/ice_devlink_port.h"
#include "ice_sf_eth.h"
diff --git a/drivers/net/ethernet/intel/ice/ice_repr.c
b/drivers/net/ethernet/intel/ice/ice_repr.c
index fb0171afa43e..11ead0a0365d 100644
--- a/drivers/net/ethernet/intel/ice/ice_repr.c
+++ b/drivers/net/ethernet/intel/ice/ice_repr.c
@@ -3,7 +3,7 @@
#include "ice.h"
#include "ice_eswitch.h"
-#include "ice_devlink.h"
+#include "devlink/ice_devlink.h"
#include "devlink/ice_devlink_port.h"
#include "ice_sriov.h"
#include "ice_tc_lib.h"
diff --git a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
index 3d30dfaed7d7..f00aabb68f0f 100644
--- a/drivers/net/ethernet/intel/ice/ice_sf_eth.c
+++ b/drivers/net/ethernet/intel/ice/ice_sf_eth.c
@@ -6,7 +6,7 @@
#include "ice_txrx.h"
#include "ice_fltr.h"
#include "ice_sf_eth.h"
-#include "ice_devlink.h"
+#include "devlink/ice_devlink.h"
#include "devlink/ice_devlink_port.h"
static const struct net_device_ops ice_sf_netdev_ops = {
--
2.42.0
