From patchwork Sat Feb 24 12:13:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 205838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1115210dyb; Sat, 24 Feb 2024 04:13:58 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVBbd5PYBLikV6JmUa+RZBVvZduhGZwOSBHxSq8rjGxl54vDPUwJL5Etd3EE6GGWYlysO0Cv8zuq8OkPsU8L37xOZKdlg== X-Google-Smtp-Source: AGHT+IFpvqt1sTKjAQuDlC65YRE8gH7P0FYE++gs/+EpqD6xzNJ3Ozysjs5pVag9Qvfelb9J5SYJ X-Received: by 2002:a05:6358:6524:b0:17b:5e04:76c2 with SMTP id v36-20020a056358652400b0017b5e0476c2mr3024000rwg.6.1708776838745; Sat, 24 Feb 2024 04:13:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708776838; cv=pass; d=google.com; s=arc-20160816; b=xssr65PpzFWGAKc5fUyVYj95sGSQNDFHSOVG2MffK3/OxDJ0mJh1WH7761vZ6zvO9n Frcg4XsCiIgo5XURg/4uWeSI54x1oCkRB52Y517ZraJ80FbHehI2RdxhA6qar4Ct4LJW 78SVsiwL5NtR7LAI84+MaJFRIkQFunarI8TGfnuP4aT6rMNcJg6kCr0pT9HJKPpiZ+Ci TPd5wPuxt2oGVuO/OYPOXzfYw6Sy+w7PoSxkY1wPjjtvCCYsJ+AnWO4eJSR7UacpwxsJ gSHYMuzDxVF/RPlQIhkLkSBIpPl6iA542R2z4e1VXp5x38doWAjS1uBwztOEZUL+p9P5 QJTg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=w4/Y03V6mt1FJRtgODWgWlTp/yB2V5Gowvh5FFHmA+g=; fh=OWIRDvrHsFwrrvmSjSKpQQ4qAQ0mg4WWogikyQ5T1q0=; b=SMOD8OgLAhsMX8hcVTjYm5AydQ4/wezxxaZelatpsIzLhfiBNDeNbrPCZKsn+7Ftow E/A9CRIWWrQSqCT7CcFfJgXeDUWxPEt9cdfEDy2Q0DND57kgIkGbnr2TEvRro2v/d7wt aqVZqdTfWN8lDdNj6SiRuST2IXRo3jHV0Mf6hDd+ftN392aSM3tqBxeV8kYj4ULmUS2c 9zcfgm09gIpzhbqCnnHlXusLHt1SJx72fXh9Wa6eXg0bxMahigi6H9wRmxbvoh5UnYVH Pw+PgkIYCViDUNwBkoKvH2pZK0v4G4uQxwGrFM8hmlbkzyQqBQym20CsBtdUgabG2gkZ 9w7A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JBBbX1x8; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79632-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79632-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k72-20020a636f4b000000b005dcc035ca8fsi836681pgc.561.2024.02.24.04.13.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:13:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79632-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JBBbX1x8; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79632-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79632-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 87B9D284039 for ; Sat, 24 Feb 2024 12:13:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 39C9C3F8E0; Sat, 24 Feb 2024 12:13:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JBBbX1x8" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 90778250EA; Sat, 24 Feb 2024 12:13:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776816; cv=none; b=k7n6qiomz8wdgmlm+L9ewMgVrY/fKB32XF4xE2nhx+xLXpgXVez7rQwnmk8+TCQpTbJJCUECFB1YLFohAQhVJ5u1j5RP+viMZuYbimjhQZ5kbSeNnEzMKC86FfO1EWKx8tyRZptx3JpXzM41h95h9G1AoTtJURsjQIHjtMZ4CY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776816; c=relaxed/simple; bh=XuZaYULxt+QGAQ9Uunj4VVZWgUNRWuw89lnYQs72UaE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=OocDjRbFzgmS/l11sIvoiXuEHShmIMQ8KHrfWgR7KhZZLOqUiS/wwcgVe1G6ie5YWzrzdy6Y3f5U+KQONPW+A+F+VcRImMV4OTTwsFh/zsSKmvvhCu4VVIct9Io/44/T1NQyuovRS6EPL6Em+eaP3KSqOMlfEZXRP4PUwmpxWRQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JBBbX1x8; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F5F8C433C7; Sat, 24 Feb 2024 12:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708776816; bh=XuZaYULxt+QGAQ9Uunj4VVZWgUNRWuw89lnYQs72UaE=; h=From:To:Cc:Subject:Date:From; b=JBBbX1x8mXKUnleDNXQBhFhFYeFJbRFjBjjYJTrUf9jotWBHCZANs+6ulYxs5u60B FuvoWL758zNYDzP/rlga/Z3DlOqtANpMKFbBng9LwIBORz88DS3N5oLTT2DjdaNhHv YhMQLfTibP4NVtubCa2jCcfB5bu6Z1c5QyIl2nFd1/SH3UeDX/KJmxW/bIdLpf/gaE r84yG8YdODU8ZFreixoKcE6nuDE3tUyDUECbPgQZQa0sIkJXIyJ5yzLdU8cld3US9p RmKPse8uLoH6MsC9mKy6/3nmfGS/87zixtpIZYVlWxHHibsIvJtgTkM7pLyClkcyAl P/eBrfdD7z0yw== From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal Cc: Arnd Bergmann , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: xtables: fix IP6_NF_IPTABLES_LEGACY typo Date: Sat, 24 Feb 2024 13:13:13 +0100 Message-Id: <20240224121330.1924338-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791782382421232854 X-GMAIL-MSGID: 1791782382421232854 From: Arnd Bergmann CONFIG_IP_NF_NAT accidentally selects the wrong NF_IPTABLES_LEGACY symbol, which ends up causing a link failure in some configurations: WARNING: unmet direct dependencies detected for IP6_NF_IPTABLES_LEGACY Depends on [n]: NET [=y] && INET [=y] && IPV6 [=n] && NETFILTER [=y] Selected by [m]: Select IP_NF_IPTABLES_LEGACY instead of IP6_NF_IPTABLES_LEGACY. Fixes: a9525c7f6219 ("netfilter: xtables: allow xtables-nft only builds") Signed-off-by: Arnd Bergmann --- net/ipv4/netfilter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 87d890172809..8f6e950163a7 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -217,7 +217,7 @@ config IP_NF_NAT default m if NETFILTER_ADVANCED=n select NF_NAT select NETFILTER_XT_NAT - select IP6_NF_IPTABLES_LEGACY + select IP_NF_IPTABLES_LEGACY help This enables the `nat' table in iptables. This allows masquerading, port forwarding and other forms of full Network Address Port