net: thunderbolt: Move into own directory

We will be adding tracepoints to the driver so instead of littering the
main network driver directory, move the driver into its own directory.
While there, rename the module to thunderbolt_net (with underscore) to
match with the thunderbolt_dma_test convention.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Yehezkel Bernat <YehezkelShB@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index c1062b4..c3d796e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20789,7 +20789,7 @@ M:      Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Yehezkel Bernat <YehezkelShB@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     drivers/net/thunderbolt.c
+F:     drivers/net/thunderbolt/
 
 THUNDERX GPIO DRIVER
 M:     Robert Richter <rric@kernel.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9e63b8c..950a09f 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -583,18 +583,7 @@ config FUJITSU_ES
          This driver provides support for Extended Socket network device
          on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.
 
-config USB4_NET
-       tristate "Networking over USB4 and Thunderbolt cables"
-       depends on USB4 && INET
-       help
-         Select this if you want to create network between two computers
-         over a USB4 and Thunderbolt cables. The driver supports Apple
-         ThunderboltIP protocol and allows communication with any host
-         supporting the same protocol including Windows and macOS.
-
-         To compile this driver a module, choose M here. The module will be
-         called thunderbolt-net.
-
+source "drivers/net/thunderbolt/Kconfig"
 source "drivers/net/hyperv/Kconfig"
 
 config NETDEVSIM

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6ce0764..e26f98f 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -84,8 +84,6 @@ obj-$(CONFIG_HYPERV_NET) += hyperv/
 obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
 
 obj-$(CONFIG_FUJITSU_ES) += fjes/
-
-thunderbolt-net-y += thunderbolt.o
-obj-$(CONFIG_USB4_NET) += thunderbolt-net.o
+obj-$(CONFIG_USB4_NET) += thunderbolt/
 obj-$(CONFIG_NETDEVSIM) += netdevsim/
 obj-$(CONFIG_NET_FAILOVER) += net_failover.o

diff --git a/drivers/net/thunderbolt/Kconfig b/drivers/net/thunderbolt/Kconfig
new file mode 100644 (file)
index 0000000..e127848
--- /dev/null
+++ b/drivers/net/thunderbolt/Kconfig
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config USB4_NET
+       tristate "Networking over USB4 and Thunderbolt cables"
+       depends on USB4 && INET
+       help
+         Select this if you want to create network between two computers
+         over a USB4 and Thunderbolt cables. The driver supports Apple
+         ThunderboltIP protocol and allows communication with any host
+         supporting the same protocol including Windows and macOS.
+
+         To compile this driver a module, choose M here. The module will be
+         called thunderbolt_net.

diff --git a/drivers/net/thunderbolt/Makefile b/drivers/net/thunderbolt/Makefile
new file mode 100644 (file)
index 0000000..dd644c8
--- /dev/null
+++ b/drivers/net/thunderbolt/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_USB4_NET) := thunderbolt_net.o
+thunderbolt_net-objs := main.o

diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt/main.c
similarity index 100%
rename from drivers/net/thunderbolt.c
rename to drivers/net/thunderbolt/main.c