77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
From 4f772f16ad4bf23a6daee30f3908133f3d0c3a90 Mon Sep 17 00:00:00 2001
|
|
From: Michal Kubecek <mkubecek@suse.cz>
|
|
Date: Wed, 11 Dec 2019 10:58:24 +0100
|
|
Subject: [PATCH 158/283] ethtool: move to its own directory
|
|
|
|
mainline inclusion
|
|
from mainline-v5.6-rc1
|
|
commit 9ce48e5a09ea63a7867647af68caa0605d99757d
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN3D
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9ce48e5a09ea63a7867647af68caa0605d99757d
|
|
|
|
--------------------------------
|
|
|
|
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>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
net/Makefile | 2 +-
|
|
net/core/Makefile | 2 +-
|
|
net/ethtool/Makefile | 3 +++
|
|
net/{core/ethtool.c => ethtool/ioctl.c} | 0
|
|
4 files changed, 5 insertions(+), 2 deletions(-)
|
|
create mode 100644 net/ethtool/Makefile
|
|
rename net/{core/ethtool.c => ethtool/ioctl.c} (100%)
|
|
|
|
diff --git a/net/Makefile b/net/Makefile
|
|
index 177b6fbac29c..77417f82cf3f 100644
|
|
--- a/net/Makefile
|
|
+++ b/net/Makefile
|
|
@@ -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/
|
|
diff --git a/net/core/Makefile b/net/core/Makefile
|
|
index 80175e6a2eb8..55734d0a1603 100644
|
|
--- a/net/core/Makefile
|
|
+++ b/net/core/Makefile
|
|
@@ -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
|
|
diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile
|
|
new file mode 100644
|
|
index 000000000000..7e5c9eb85c90
|
|
--- /dev/null
|
|
+++ b/net/ethtool/Makefile
|
|
@@ -0,0 +1,3 @@
|
|
+# SPDX-License-Identifier: GPL-2.0-only
|
|
+
|
|
+obj-y += ioctl.o
|
|
diff --git a/net/core/ethtool.c b/net/ethtool/ioctl.c
|
|
similarity index 100%
|
|
rename from net/core/ethtool.c
|
|
rename to net/ethtool/ioctl.c
|
|
--
|
|
2.34.1
|
|
|