From nobody Mon Feb 9 11:04:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A83E3587CB for ; Mon, 12 Jan 2026 12:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222492; cv=none; b=Ljkyb3/DwpVciGyuHyR2wvPCTCOhG2qT/Pks8zeofK2h12W+KKFuZo/YRiUbG7DQcIm5eTbh5zY2i9sdzmDjZFmeXxDFzPUIn22qV0x2E4PJx4vhIoNU7YZ0BAO8p1VLLFNFc6YOKNhfZEtQqjqgOr4HWvAqQikH9u4TUTYjD2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768222492; c=relaxed/simple; bh=V7UrOAgbBjKbnTlNQ87vW7Z6nwRklkpYJYPGjtD9Pw0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Iwysw2w5WDIOfgG5tIy3M1QedWwWs0MktoFxLKtVmYiPppk49nZQuNt6RmbXH1FTlTa8hdXA9P1R4N03nYoaf9W+qt6svHbIiX+rRvqQnmjlbytaRGVi94cQJezuDQTHhTPn6zkkRM1esbg8s6Hkfg8HBjFbL1xjsXtaFjyf5G0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=X5wkjHSk; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=OOTXesEH; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X5wkjHSk"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="OOTXesEH" 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=X5wkjHSkYASjPdT1nI5iE7J9Yb1uMF4TzsRZxig/PqgH4pGUbACJS5ZB4Mzg3TbeZLYyBM hgcow85AQ+aQXpT4NzkbWdr291Jf3KLjHxqpuEjajK0ZZntISJkRpqZeX5tEPQ7GT7F/+T v7vOdd+9ddhzdI58gNWH8+H4X14nvQo= 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-677-M8yw-YhtMb-jD0h3K8Zo-Q-1; Mon, 12 Jan 2026 07:54:46 -0500 X-MC-Unique: M8yw-YhtMb-jD0h3K8Zo-Q-1 X-Mimecast-MFC-AGG-ID: M8yw-YhtMb-jD0h3K8Zo-Q_1768222485 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-64d53a7817eso8874069a12.3 for ; Mon, 12 Jan 2026 04:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768222485; x=1768827285; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s/ujfx9fRHizDfrh38x0NK7m/HfIxQpjC07mOPX7fVQ=; b=OOTXesEHgTZrDgmW1E8LbtzZM//1wQEKtW7OCr9r3fEaXZVt/hvQBVzlc6XjtYsMom dkCZ8By6+k2PG5ZCTe3bAEXifpgujPWyzSUYEYG8Uh4DJVp464hyii3J9Caao458gEin wzvuNcZviQb1bD3zledX24EAIJDge4yftjESfXwwWZQ0oCMB6C3ij4KTVQ6ktqHkfaYx CzWJmOPxgIXtxrLFUHXEBPCRNhWCnFshyfqgbcs8da9nrWtAIsdTttHyocbxh3lrZQsd 1VeXjBt/f5wpE/6a0SBsOxmwC4QiOTBREfI+FpmRTQJtXiF3mEW/qldt8J3oZK4UfEAZ iumA== 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=oC4UP8jUycYrDYWChBunkuXk+P59pJRYFAi+03dthhOesU0j8xFMuGX0M4zG+5ZyPt uAyprdmkwvd24XkURawRfg4NKqAAoRp5/ZXs0KGxPScAt4NvazYiTUya70Ab5YeVD3vP IFBihllLZZalYCMVnLPdXsIaPV7DqbO96tNZvdQRT5X+CuEAxD8+oYJrKYLuZ9zn7KOh vo3IQmCmSsoiwoqHVK7th8ofZm69KjkiPjNKfFauAVv9YuBEHXhAxwubZ1l+2mHwiFGp Ju9RuXTx1Ue4wSjCh1CNTi5J0CNxxpX6IPCjGwIjKtEsIhYFOapo56FgFIZenj2Y/DZ3 ArNg== X-Forwarded-Encrypted: i=1; AJvYcCU2aDkAIeLGODPtxslJrt01TZopfFJgN39qmGLNfpcMmN6OJZVscLNA2UrckDMyetkjXK5ezr3UungZ1t0=@vger.kernel.org X-Gm-Message-State: AOJu0Yykt0shxf6i91ZYoJkscQAY7dSML7cVxv3sSqchp/asdmK63pg8 qBJunyu5EUo3YEs/PKWEJYN+/AOX3tpzWtwnsBo77cXj9Uc9A4pHHINzbldxLYNGdbwgIJjQPPV E8k+MoRhkWSzBJvQl7OfKy31gSkxluUvOFDpOpIJZkI67p8kWwhecfDLYpG7UxtDCRQ== X-Gm-Gg: AY/fxX59gF1hYg/GyDqRRlu7rp5MKqZKdDNRDie9BJH5ZTHrMsXGmI+rar7v1mRGKJ0 XGNOBq3G3URiXj8GgosxQ9uKUVM+Rg9FVNL4CBoFGeUFBukfQNefj0HRiJxKAVvT52mCqSqtYzE tHUqROB09/6hX7aA0YRESB94kDt44Dzd7YOMCgS0K1H3WNCk7B1yP3R8T5qlzqX3W8LLOaI4EQM Gfnl6BA9SVdLGf/pW1tvZLdjFO3johYRgodBn9+KknJ7c3WCmt1hHXxIVtBHi5/Bxg0KY2fL17R XBIHqdU1meUYlzcwwxfkOmVqxFVywDxiUPAR0+o+rHnTgSJU15T6a3E+ev3Vf4TrtV0CHsqHjZy wteqg/YzXO7+qw42lzZ/kmbjZ4nqvSlNuU/5EcL4NzNfqutpK+yWuGlpVp5E= X-Received: by 2002:a17:907:9723:b0:b87:fc5:40ba with SMTP id a640c23a62f3a-b870fc61ea2mr392030266b.20.1768222484806; 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. =20 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. =20 -config NF_LOG_ARP - tristate "ARP packet logging" - default m if NETFILTER_ADVANCED=3Dn - 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=3Dn - 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=3Dn 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=3Dn =20 -config NF_LOG_IPV6 - tristate "IPv6 packet logging" - default m if NETFILTER_ADVANCED=3Dn - 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=3Dn + 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 --=20 2.52.0