devlink: move code to a dedicated directory

[ Upstream commit f05bd8ebeb69c803efd6d8a76d96b7fcd7011094 ]

The devlink code is hard to navigate with 13kLoC in one file.
I really like the way Michal split the ethtool into per-command
files and core. It'd probably be too much to split it all up,
but we can at least separate the core parts out of the per-cmd
implementations and put it in a directory so that new commands
can be separate files.

Move the code, subsequent commit will do a partial split.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 2ebbc9752d06 ("devlink: add missing unregister linecard notification")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 379387e..07a9c27 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6027,7 +6027,7 @@ S:        Supported
 F:     Documentation/networking/devlink
 F:     include/net/devlink.h
 F:     include/uapi/linux/devlink.h
-F:     net/core/devlink.c
+F:     net/devlink/
 
 DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT
 M:     Christoph Niedermaier <cniedermaier@dh-electronics.com>

diff --git a/net/Makefile b/net/Makefile
index 6a62e5b..0914bea 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_BPFILTER)                += bpfilter/
 obj-$(CONFIG_PACKET)           += packet/
 obj-$(CONFIG_NET_KEY)          += key/
 obj-$(CONFIG_BRIDGE)           += bridge/
+obj-$(CONFIG_NET_DEVLINK)      += devlink/
 obj-$(CONFIG_NET_DSA)          += dsa/
 obj-$(CONFIG_ATALK)            += appletalk/
 obj-$(CONFIG_X25)              += x25/

diff --git a/net/core/Makefile b/net/core/Makefile
index 5857cec..10edd66 100644 (file)
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -33,7 +33,6 @@ obj-$(CONFIG_LWTUNNEL) += lwtunnel.o
 obj-$(CONFIG_LWTUNNEL_BPF) += lwt_bpf.o
 obj-$(CONFIG_DST_CACHE) += dst_cache.o
 obj-$(CONFIG_HWBM) += hwbm.o
-obj-$(CONFIG_NET_DEVLINK) += devlink.o
 obj-$(CONFIG_GRO_CELLS) += gro_cells.o
 obj-$(CONFIG_FAILOVER) += failover.o
 obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o

diff --git a/net/devlink/Makefile b/net/devlink/Makefile
new file mode 100644 (file)
index 0000000..3a60959
--- /dev/null
+++ b/net/devlink/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y := leftover.o

diff --git a/net/core/devlink.c b/net/devlink/leftover.c
similarity index 100%
rename from net/core/devlink.c
rename to net/devlink/leftover.c