From: Lukas Bulwahn Commit db3187ae21bb ("netfilter: nf_log_ipv4: rename to nf_log_syslog"), commit f5466caab9a8 ("netfilter: nf_log_ipv6: merge with nf_log_syslog") and commit f11d61e7957d ("netfilter: nf_log_arp: merge with nf_log_syslog") deprecate the config options NF_LOG_ARP, NF_LOG_IPV4, and NF_LOG_IPV6 in March 2021. Its corresponding functionality is provided by enabling the config option NF_LOG_SYSLOG instead. To allow older kernel configuration to still function, the deprecated config options are not removed but select the new config option. With the recent addition of the transitional attribute for config options in commit f9afce4f32e9 ("kconfig: Add transitional symbol attribute for migration support"), deprecated config options can be marked transitional, and new options can be set by defaulting to the deprecated option. So, turn NF_LOG_ARP, NF_LOG_IPV4, and NF_LOG_IPV6 into transitional config options. Note that transitional config options cannot have any dependencies, so the config definitions are moved to the end of the net/Kconfig file to have no implicit dependencies. Signed-off-by: Lukas Bulwahn --- net/Kconfig | 21 +++++++++++++++++++++ net/ipv4/netfilter/Kconfig | 16 ---------------- net/ipv6/netfilter/Kconfig | 8 -------- net/netfilter/Kconfig | 1 + 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index 62266eaf0e95..5bb1b98e8023 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -544,3 +544,24 @@ config NET_TEST If unsure, say N. endif # if NET + +config NF_LOG_ARP + tristate + transitional + help + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig) to transition to NF_LOG_SYSLOG. + +config NF_LOG_IPV4 + tristate + transitional + help + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig) to transition to NF_LOG_SYSLOG. + +config NF_LOG_IPV6 + tristate + transitional + help + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig) to transition to NF_LOG_SYSLOG. diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 7dc9772fe2d8..dfe29cedcc2c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -76,22 +76,6 @@ config NF_DUP_IPV4 This option enables the nf_dup_ipv4 core, which duplicates an IPv4 packet to be rerouted to another destination. -config NF_LOG_ARP - tristate "ARP packet logging" - default m if NETFILTER_ADVANCED=n - select NF_LOG_SYSLOG - help - This is a backwards-compat option for the user's convenience - (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG. - -config NF_LOG_IPV4 - tristate "IPv4 packet logging" - default m if NETFILTER_ADVANCED=n - select NF_LOG_SYSLOG - help - This is a backwards-compat option for the user's convenience - (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG. - config NF_REJECT_IPV4 tristate "IPv4 packet rejection" default m if NETFILTER_ADVANCED=n diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 81daf82ddc2d..60cf6269523c 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -69,14 +69,6 @@ config NF_REJECT_IPV6 tristate "IPv6 packet rejection" default m if NETFILTER_ADVANCED=n -config NF_LOG_IPV6 - tristate "IPv6 packet logging" - default m if NETFILTER_ADVANCED=n - select NF_LOG_SYSLOG - help - This is a backwards-compat option for the user's convenience - (e.g. when running oldconfig). It selects CONFIG_NF_LOG_SYSLOG. - config IP6_NF_IPTABLES tristate "IP6 tables support (required for filtering)" depends on INET && IPV6 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 6cdc994fdc8a..c7f9fcaf6028 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -98,6 +98,7 @@ config NF_CONNTRACK config NF_LOG_SYSLOG tristate "Syslog packet logging" default m if NETFILTER_ADVANCED=n + default NF_LOG_ARP || NF_LOG_IPV4 || NF_LOG_IPV6 help This option enable support for packet logging via syslog. It supports IPv4, IPV6, ARP and common transport protocols such -- 2.52.0