OSDN Git Service

ethtool: move to its own directory
authorMichal Kubecek <mkubecek@suse.cz>
Wed, 11 Dec 2019 09:58:24 +0000 (10:58 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Dec 2019 01:07:05 +0000 (17:07 -0800)
The ethtool netlink interface is going to be split into multiple files so
that it will be more convenient to put all of them in a separate directory
net/ethtool. Start by moving current ethtool.c with ioctl interface into
this directory and renaming it to ioctl.c.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/Makefile
net/core/Makefile
net/ethtool/Makefile [new file with mode: 0644]
net/ethtool/ioctl.c [moved from net/core/ethtool.c with 100% similarity]

index 449fc0b..848303d 100644 (file)
@@ -13,7 +13,7 @@ obj-$(CONFIG_NET)             += $(tmp-y)
 
 # LLC has to be linked before the files in net/802/
 obj-$(CONFIG_LLC)              += llc/
-obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/ bpf/
+obj-$(CONFIG_NET)              += ethernet/ 802/ sched/ netlink/ bpf/ ethtool/
 obj-$(CONFIG_NETFILTER)                += netfilter/
 obj-$(CONFIG_INET)             += ipv4/
 obj-$(CONFIG_TLS)              += tls/
index a104dc8..3e2c378 100644 (file)
@@ -8,7 +8,7 @@ obj-y := sock.o request_sock.o skbuff.o datagram.o stream.o scm.o \
 
 obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
 
-obj-y               += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
+obj-y               += dev.o dev_addr_lists.o dst.o netevent.o \
                        neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
                        sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \
                        fib_notifier.o xdp.o flow_offload.o
diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
new file mode 100644 (file)
index 0000000..7e5c9eb
--- /dev/null
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-y          += ioctl.o
similarity index 100%
rename from net/core/ethtool.c
rename to net/ethtool/ioctl.c