diff --git a/net/Kconfig b/net/Kconfig index c0638ea8a56033b7bb49785a1da6155e678a7f8e..2d8f9ae5608fa3da4d74664dc6f97085dda941dc 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -459,13 +459,7 @@ 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" endif # if NET diff --git a/net/Makefile b/net/Makefile index 37513c69bcfb90971c3a7627f3349561cadd74fd..f9d1b0070d6f7ba10e7aa7c4997b4d546a6f8ba5 100644 --- a/net/Makefile +++ b/net/Makefile @@ -88,11 +88,4 @@ obj-$(CONFIG_QRTR) += qrtr/ 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/ +obj-$(CONFIG_NEWIP) += newip/ \ No newline at end of file diff --git a/net/net_hooks/Kconfig b/net/net_hooks/Kconfig deleted file mode 100644 index dd37b6bca6a064701566fa1d13d99b4830e109ee..0000000000000000000000000000000000000000 --- 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 f74fc2d253839758b34de9d62bef5d0ed9326033..0000000000000000000000000000000000000000 --- 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