From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2E8CC9EC86 for ; Mon, 12 Jan 2026 12:55:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=H6Bk28eaXqzN1yl6HvEgj5ZSb7pjpe9fUBPRhSnnRiI=; b=ZNHQWZ0GC+uC4c Z0EvLxcfYMzcTns/7AbhlEcht+0zfaneGykD0BDbrbJYldXiu/U0WBTCMIXHvB+1Dn0BbjR05reDW bXKyR6cRzzW4IOtwLb2wD2d+MtNrVwHvTlXSyA9KUcP766ggNMz43xuqavlhepFVyga87Fkn1nSZf PMlnQNZtV/DR1td+los9LYAM0rxTwNpmuRtkIgdtKrAZnw+/vdkhzaDtpQo+RJjiB6Ex+Vq2NVY7r DAryR5Gr4hwGTb0D9TQnMyCTK810NfvoMptDPsA5ZM4Es3A9qJbI0NoOt8HyHkY83xQj8c0uRVKQT 6oF4YYO0tKBjKipCjSnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vfHRb-00000005M8K-39DI; Mon, 12 Jan 2026 12:54:51 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vfHRZ-00000005M7b-1BGb for linux-riscv@lists.infradead.org; Mon, 12 Jan 2026 12:54:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768222487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=L9EbYjhvgfkYYwUGL/LNBm7nNfZ+R9xQ1wcjXPRntrItQ3jfJyA2bL7Focn3drXQ5cahqV FpqVUE5YM6uPr4J1ldLdU+m0rAOp6uhtpLysEhotUSUTXrquKU7E2FjqsuFd72Pl6lzFEZ de/MV8EaS3vbcFCRiwhp23bjfM6Utyc= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-LEIgfwQKMwCJhBceOOWu7w-1; Mon, 12 Jan 2026 07:54:46 -0500 X-MC-Unique: LEIgfwQKMwCJhBceOOWu7w-1 X-Mimecast-MFC-AGG-ID: LEIgfwQKMwCJhBceOOWu7w_1768222485 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-64cfbb4c464so8325272a12.2 for ; Mon, 12 Jan 2026 04:54:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768222485; x=1768827285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=pwz/YvbjQmUP5610/wJI3YWK0y/uMLSE0GjEfpxi2P2AB9ITDFTxeVZaGhuht5J4L5 5M169PbWNpmzYnN1hZ3Q59/k2Pa120lLQ4Njcb0IzQPluRatqek9FzIEykqDNGT3aq/h v8aHu6I1+IJQ/9YBKTRKolSYuWddNIDlRMVfOWcXwcK3gGd5AK83pREZ4ZHkOyOSHAdv owVVIr8CFqsLvUikfJEYA0AaHy95qFWGFtza2uG7jIgDtsZJrny7z2TuSmKPT4+BTCkO Wb8a+XT4XpcmrcvVS+Hh9l9L3zK7M8Vd6TFt1JeJjP3UTx9RXlsFbSvIO7YfML/Qvbgi IhOQ== X-Forwarded-Encrypted: i=1; AJvYcCUueK195cQR2XNsv50ea9YCiJA6ay9IgqPP8B/Jp8MpaGmFkK8CnjXxYf96YPgEQ2M0Z0f8uMcgPPz3wg==@lists.infradead.org X-Gm-Message-State: AOJu0Yw1bZqCFGCZTy7/O/Zq11qqV8GkXrUqUOL99xABaDfhiZ2SNEe+ f8ENH+cfPHmXwYdYErfYx2amwUkarRpfVbeUokap/AY01ITpmRIGzZurgzsx9PbLoAyNLLn57Mh PM50fuLqq1BMA+r4MFNuq4+dd94oAZoYCFwf9q3Hql7crCS6cnAXOR0cbp6iC6URmTYQiKA== X-Gm-Gg: AY/fxX487Y2K9gVgXSqHdwHMQP6iYTqxWUUs71L1ImulVrfGOAD1EZn2dH50Nyv2VFP pADhQtXB7bibHZYzv3xrfWNShTlNTS6WbCntPEtohd+VwRVMv/WAWKF4FSU0AKVPl8XtilHBhQi pgbdxz2x55ei5RnNRUTsgs4/IKWUBV/kg+CoeuP2R1PHS4Ms3euBzKJb59kZZGgxi3QbvMGmUlN T68mhjQ9Xw321vZuBwSb+B2ppIOopJ8zYojAiMaFgZNbsoZEHjKJppei9OHrKm+r6/HEpD2bn3Q oXMED0KA8VGPYVA94UlVxSW9Hq+c9gbNuj8ZP7sLwKieG/Y9czPznnpSi+Nn7sqPxEZ/g8yxvEx zt7xl/2wFh5jx6gGl9JkwXYkiTug4zM4RmW6EQj/qzmLAvoh7AJnwnYZ+Bh4= X-Received: by 2002:a17:907:9723:b0:b87:fc5:40ba with SMTP id a640c23a62f3a-b870fc61ea2mr392027966b.20.1768222484784; Mon, 12 Jan 2026 04:54:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFTp5OSOsuyPTMRe4k38M6nE4/+Im8kgtNw0qudOBH1k9hgAUwyjKyKRD7tIQGL1L74hJziAQ== X-Received: by 2002:a17:907:9723:b0:b87:fc5:40ba with SMTP id a640c23a62f3a-b870fc61ea2mr392025666b.20.1768222484256; Mon, 12 Jan 2026 04:54:44 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen12.rmtde.csb ([2a02:810d:7e01:ef00:ff56:9b88:c93b:ed43]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8706c2604bsm497062466b.16.2026.01.12.04.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 04:54:43 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , David Ahern , netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Cc: Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-riscv@lists.infradead.org, linux-m68k@lists.linux-m68k.org, linux-s390@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [RFC PATCH 1/5] net: make configs NF_LOG_{ARP,IPV4,IPV6} transitional Date: Mon, 12 Jan 2026 13:54:27 +0100 Message-ID: <20260112125432.61218-2-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112125432.61218-1-lukas.bulwahn@redhat.com> References: <20260112125432.61218-1-lukas.bulwahn@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: DJ9uszfSP-h2Vak0CI_n0YxNA1UtUIHEMIaXpv7ElsA_1768222485 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260112_045449_391219_91E96E2A X-CRM114-Status: GOOD ( 17.41 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv