From 8165b5aaa7ab067f745dafe07743984a34b37abe Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 11 Nov 2022 10:47:57 +0800 Subject: [PATCH 1/5] newip kconfig auto enable Signed-off-by: yangyanjun --- net/Kconfig | 9 ++------- net/Makefile | 16 +++++++++------- net/net_hooks/Kconfig | 39 --------------------------------------- net/net_hooks/Makefile | 18 ------------------ 4 files changed, 11 insertions(+), 71 deletions(-) delete mode 100644 net/net_hooks/Kconfig delete mode 100644 net/net_hooks/Makefile diff --git a/net/Kconfig b/net/Kconfig index c0638ea8a560..c02eab19b41b 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -459,13 +459,8 @@ config ETHTOOL_NETLINK netlink. It provides better extensibility and some new features, e.g. notification messages. -# The Kconfig file is inserted when the "linux-5.10\net\" directory -# adds a separate warehouse module. The content of the Kconfig file -# of the new module is added to this file to avoid downloading the -# kernel repository separately. When the kernel repository is not downloaded, -# an error message is displayed indicating that the Kconfig file of the new -# module cannot be found. -source "net/net_hooks/Kconfig" +source "net/newip/Kconfig" +source "net/newip/hooks/Kconfig" endif # if NET diff --git a/net/Makefile b/net/Makefile index 37513c69bcfb..05e6f82616df 100644 --- a/net/Makefile +++ b/net/Makefile @@ -89,10 +89,12 @@ obj-$(CONFIG_NET_NCSI) += ncsi/ obj-$(CONFIG_XDP_SOCKETS) += xdp/ obj-$(CONFIG_MPTCP) += mptcp/ -# The Makefile file is inserted when the "linux-5.10\net\" directory -# adds a separate warehouse module. The content of the Makefile file -# of the new module is added to this file to avoid downloading the -# kernel repository separately. When the kernel repository is not downloaded, -# an error message is displayed indicating that the Makefile file of the new -# module cannot be found. -obj-$(CONFIG_NET) += net_hooks/ +# net/newip/hooks/Makefile +ifeq ($(CONFIG_NEWIP_HOOKS),y) +obj-$(CONFIG_NET) += newip/hooks/ +endif + +# net/newip/Makefile +ifeq ($(CONFIG_NEWIP),y) +obj-$(CONFIG_NET) += newip/ +endif diff --git a/net/net_hooks/Kconfig b/net/net_hooks/Kconfig deleted file mode 100644 index dd37b6bca6a0..000000000000 --- a/net/net_hooks/Kconfig +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Copyright (c) 2022 Huawei Device Co., Ltd. -# -# The Kconfig file is inserted when the "linux-5.10\net\" directory -# adds a separate warehouse module. The content of the Kconfig file -# of the new module is added to this file to avoid downloading the -# kernel repository separately. When the kernel repository is not downloaded, -# an error message is displayed indicating that the Kconfig file of the new -# module cannot be found. -# - -# NewIP as module will cause a CRASH if you try to unload it -# net/newip -menuconfig NEWIP - bool "The NewIP protocol" - depends on INET - default n - help - Support for NewIP. - -if NEWIP -config NEWIP_HOOKS - bool "NewIP Hooks" - depends on VENDOR_HOOKS && NEWIP - default n - help - Enable NewIP hooks implemented as tracepoints - Allow NewIP modules to attach to tracepoint "hooks" defined via - DECLARE_TRACE or DECLARE_HOOK - -config NEWIP_FAST_KEEPALIVE - bool "NewIP fast keepalive" - default n - help - Support for NewIP fast keepalive. - -endif # NEWIP - diff --git a/net/net_hooks/Makefile b/net/net_hooks/Makefile deleted file mode 100644 index f74fc2d25383..000000000000 --- a/net/net_hooks/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# The Makefile file is inserted when the "linux-5.10\net\" directory -# adds a separate warehouse module. The content of the Makefile file -# of the new module is added to this file to avoid downloading the -# kernel repository separately. When the kernel repository is not downloaded, -# an error message is displayed indicating that the Makefile file of the new -# module cannot be found. - -# net/newip/hooks/Makefile -ifeq ($(CONFIG_NEWIP_HOOKS),y) -obj-$(CONFIG_NET) += ../newip/hooks/ -endif - -# net/newip/Makefile -ifeq ($(CONFIG_NEWIP),y) -obj-$(CONFIG_NET) += ../newip/ -endif -- Gitee From 0bbb0ed4a31bb83b6fd1f799a0a9a2312b676256 Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 11 Nov 2022 14:49:04 +0800 Subject: [PATCH 2/5] newip kconfig auto enable Signed-off-by: yangyanjun --- net/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/net/Kconfig b/net/Kconfig index c02eab19b41b..2d8f9ae5608f 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -460,7 +460,6 @@ config ETHTOOL_NETLINK e.g. notification messages. source "net/newip/Kconfig" -source "net/newip/hooks/Kconfig" endif # if NET -- Gitee From 171108338cdc840f9f2c3463b73c90af54ad279d Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 11 Nov 2022 15:13:16 +0800 Subject: [PATCH 3/5] newip kconfig auto enable Signed-off-by: yangyanjun --- net/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/Makefile b/net/Makefile index 05e6f82616df..d1dfeee164f5 100644 --- a/net/Makefile +++ b/net/Makefile @@ -89,11 +89,6 @@ obj-$(CONFIG_NET_NCSI) += ncsi/ obj-$(CONFIG_XDP_SOCKETS) += xdp/ obj-$(CONFIG_MPTCP) += mptcp/ -# net/newip/hooks/Makefile -ifeq ($(CONFIG_NEWIP_HOOKS),y) -obj-$(CONFIG_NET) += newip/hooks/ -endif - # net/newip/Makefile ifeq ($(CONFIG_NEWIP),y) obj-$(CONFIG_NET) += newip/ -- Gitee From 3c03fc4c8357959dd5234d78c832e9e0633ed068 Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 11 Nov 2022 16:29:58 +0800 Subject: [PATCH 4/5] newip kconfig auto enable Signed-off-by: yangyanjun --- net/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/Makefile b/net/Makefile index d1dfeee164f5..f802e28b7dae 100644 --- a/net/Makefile +++ b/net/Makefile @@ -89,7 +89,5 @@ obj-$(CONFIG_NET_NCSI) += ncsi/ obj-$(CONFIG_XDP_SOCKETS) += xdp/ obj-$(CONFIG_MPTCP) += mptcp/ -# net/newip/Makefile -ifeq ($(CONFIG_NEWIP),y) -obj-$(CONFIG_NET) += newip/ -endif +obj-$(CONFIG_NEWIP) += newip/ + -- Gitee From a01037d6b019976fc034afc344d901c04cf63b78 Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 11 Nov 2022 16:45:03 +0800 Subject: [PATCH 5/5] newip kconfig auto enable Signed-off-by: yangyanjun --- net/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/Makefile b/net/Makefile index f802e28b7dae..f9d1b0070d6f 100644 --- a/net/Makefile +++ b/net/Makefile @@ -88,6 +88,4 @@ obj-$(CONFIG_QRTR) += qrtr/ obj-$(CONFIG_NET_NCSI) += ncsi/ obj-$(CONFIG_XDP_SOCKETS) += xdp/ obj-$(CONFIG_MPTCP) += mptcp/ - -obj-$(CONFIG_NEWIP) += newip/ - +obj-$(CONFIG_NEWIP) += newip/ \ No newline at end of file -- Gitee