Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2218429/?format=api
{ "id": 2218429, "url": "http://patchwork.ozlabs.org/api/patches/2218429/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260401074509.1897527-2-dwmw2@infradead.org/", "project": { "id": 26, "url": "http://patchwork.ozlabs.org/api/projects/26/?format=api", "name": "Netfilter Development", "link_name": "netfilter-devel", "list_id": "netfilter-devel.vger.kernel.org", "list_email": "netfilter-devel@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260401074509.1897527-2-dwmw2@infradead.org>", "list_archive_url": null, "date": "2026-04-01T07:44:15", "name": "[1/6] net: Simplify tautological CONFIG_INET/CONFIG_IPV6 guards", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7bc6c2d78deaa51878f65e4649c59e5c40d26033", "submitter": { "id": 26, "url": "http://patchwork.ozlabs.org/api/people/26/?format=api", "name": "David Woodhouse", "email": "dwmw2@infradead.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260401074509.1897527-2-dwmw2@infradead.org/mbox/", "series": [ { "id": 498288, "url": "http://patchwork.ozlabs.org/api/series/498288/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=498288", "date": "2026-04-01T07:44:20", "name": "Deprecate Legacy IP", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498288/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2218429/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218429/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <netfilter-devel+bounces-11533-incoming=patchwork.ozlabs.org@vger.kernel.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "netfilter-devel@vger.kernel.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=desiato.20200630 header.b=Cj5jYf8L;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c15:e001:75::12fc:5321; helo=sin.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11533-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org\n header.b=\"Cj5jYf8L\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=90.155.92.199", "smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=infradead.org", "smtp.subspace.kernel.org;\n spf=none smtp.mailfrom=desiato.srs.infradead.org" ], "Received": [ "from sin.lore.kernel.org (sin.lore.kernel.org\n [IPv6:2600:3c15:e001:75::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fly7R6c8kz1yCp\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 01 Apr 2026 18:59:31 +1100 (AEDT)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sin.lore.kernel.org (Postfix) with ESMTP id 505E8305F965\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 1 Apr 2026 07:46:10 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 08D03390226;\n\tWed, 1 Apr 2026 07:45:47 +0000 (UTC)", "from desiato.infradead.org (desiato.infradead.org [90.155.92.199])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D31438A720;\n\tWed, 1 Apr 2026 07:45:42 +0000 (UTC)", "from [2001:8b0:10b:1::425] (helo=i7.infradead.org)\n\tby desiato.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1w7qGN-0000000HLQP-0C5r;\n\tWed, 01 Apr 2026 07:45:20 +0000", "from dwoodhou by i7.infradead.org with local (Exim 4.98.2 #2 (Red\n Hat Linux))\n\tid 1w7qGM-00000007xe5-1ZeE;\n\tWed, 01 Apr 2026 08:45:18 +0100" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775029546; cv=none;\n b=gQl1QYk0f5YvfRWeCfEYtoM1Whm6q6WLlSgXZTnjduIfOXzLIk383maW8Kl/sabtXMn8NVnQd3q/fnSHK8U9XNdZEmKh5LW/QF2ycs4vJGErCOTpMqcEnHBnDEFLkxoiM+qottVCCUKZ163u0b07dvt+0kDcoMAHUS7uMzNuYqA=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775029546; c=relaxed/simple;\n\tbh=G+MOIw6te2PEYObUvRNoONaiOWjDHRklhl8RTcJVPZI=;\n\th=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=miO9NgUiIXL7xUA4YrDvuGqmEjnhgwCUngY3kdlzJ6s6x+j3TTH8t0ydSuYinVLQZaJvgCo2gsQzJOH9uJmIHUbz4LGc2+z5q+O0zK+Mkp8LtkMSCLRx6f+GCDTpCV5X75VHNxSipxDeIC9aHcpdEJRP8m/bGEkAg7j8j03rpWg=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=infradead.org;\n spf=none smtp.mailfrom=desiato.srs.infradead.org;\n dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org\n header.b=Cj5jYf8L; arc=none smtp.client-ip=90.155.92.199", "DKIM-Signature": "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding:\n\tMIME-Version:References:In-Reply-To:Message-ID:Date:Subject:To:From:Reply-To:\n\tCc:Content-Type:Content-ID:Content-Description;\n\tbh=h+p+VmdWrOOE3XGa5ETBNDsBTi8oEa3Q6yVdlq8p0TQ=; b=Cj5jYf8LEO52SYJSteJD++g+jR\n\tnxIMi2FBOq6FCP5C1gDwhsPoPpYGA9vx+jXOkaIfMVFWqsqNVOKYhZSO1U91eV6SyU6l4e1vtVVt8\n\tCRNdM6eFadOnbCYoBPXxXZps8ykTWb6jG/w3nid2e5/e/trzQDLXJKKisSQ+1Cb8okh+eAwxsIubl\n\tx4tr5WC2fydMBYBVHmjEXNZuKknil+uGbfBpbvlwZKsQ39AT06qKDQMdKHmNKRld4luM6SayP4CKf\n\tvrpwcDhzc3qkEVGuaanf2jMapJLhWqhn0GTgfW+USWPhYLux76UlPlWzlTigUJ4z30UuWJoath5TZ\n\tbp9qQlUA==;", "From": "David Woodhouse <dwmw2@infradead.org>", "To": "Saeed Mahameed <saeedm@nvidia.com>,\n\tLeon Romanovsky <leon@kernel.org>,\n\tTariq Toukan <tariqt@nvidia.com>,\n\tMark Bloch <mbloch@nvidia.com>,\n\tAndrew Lunn <andrew+netdev@lunn.ch>,\n\t\"David S. Miller\" <davem@davemloft.net>,\n\tEric Dumazet <edumazet@google.com>,\n\tJakub Kicinski <kuba@kernel.org>,\n\tPaolo Abeni <pabeni@redhat.com>,\n\tSimon Horman <horms@kernel.org>,\n\tNikolay Aleksandrov <razor@blackwall.org>,\n\tIdo Schimmel <idosch@nvidia.com>,\n\tMartin KaFai Lau <martin.lau@linux.dev>,\n\tDaniel Borkmann <daniel@iogearbox.net>,\n\tJohn Fastabend <john.fastabend@gmail.com>,\n\tStanislav Fomichev <sdf@fomichev.me>,\n\tAlexei Starovoitov <ast@kernel.org>,\n\tAndrii Nakryiko <andrii@kernel.org>,\n\tEduard Zingerman <eddyz87@gmail.com>,\n\tSong Liu <song@kernel.org>,\n\tYonghong Song <yonghong.song@linux.dev>,\n\tKP Singh <kpsingh@kernel.org>,\n\tHao Luo <haoluo@google.com>,\n\tJiri Olsa <jolsa@kernel.org>,\n\tKuniyuki Iwashima <kuniyu@google.com>,\n\tWillem de Bruijn <willemb@google.com>,\n\tDavid Ahern <dsahern@kernel.org>,\n\tNeal Cardwell <ncardwell@google.com>,\n\tJohannes Berg <johannes@sipsolutions.net>,\n\tPablo Neira Ayuso <pablo@netfilter.org>,\n\tFlorian Westphal <fw@strlen.de>,\n\tPhil Sutter <phil@nwl.cc>,\n\tGuillaume Nault <gnault@redhat.com>,\n\tDavid Woodhouse <dwmw@amazon.co.uk>,\n\tKees Cook <kees@kernel.org>,\n\tAlexei Lazar <alazar@nvidia.com>,\n\tGal Pressman <gal@nvidia.com>,\n\tPaul Moore <paul@paul-moore.com>,\n\tnetdev@vger.kernel.org,\n\tlinux-rdma@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\toss-drivers@corigine.com,\n\tbridge@lists.linux.dev,\n\tbpf@vger.kernel.org,\n\tlinux-wireless@vger.kernel.org,\n\tnetfilter-devel@vger.kernel.org,\n\tcoreteam@netfilter.org,\n\ttorvalds@linux-foundation.org,\n\tjon.maddog.hall@gmail.com", "Subject": "[PATCH 1/6] net: Simplify tautological CONFIG_INET/CONFIG_IPV6 guards", "Date": "Wed, 1 Apr 2026 08:44:15 +0100", "Message-ID": "<20260401074509.1897527-2-dwmw2@infradead.org>", "X-Mailer": "git-send-email 2.51.0", "In-Reply-To": "<20260401074509.1897527-1-dwmw2@infradead.org>", "References": "<20260401074509.1897527-1-dwmw2@infradead.org>", "Precedence": "bulk", "X-Mailing-List": "netfilter-devel@vger.kernel.org", "List-Id": "<netfilter-devel.vger.kernel.org>", "List-Subscribe": "<mailto:netfilter-devel+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:netfilter-devel+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Sender": "David Woodhouse <dwmw2@infradead.org>", "X-SRS-Rewrite": "SMTP reverse-path rewritten from <dwmw2@infradead.org> by\n desiato.infradead.org. See http://www.infradead.org/rpr.html" }, "content": "From: David Woodhouse <dwmw@amazon.co.uk>\n\nCONFIG_IPV6 depends on CONFIG_INET, so:\n - 'IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)' simplifies\n to just 'IS_ENABLED(CONFIG_IPV6)'\n - 'IS_ENABLED(CONFIG_INET) || IS_ENABLED(CONFIG_IPV6)' simplifies\n to just 'IS_ENABLED(CONFIG_INET)'\n\nNo functional change.\n\nSigned-off-by: David Woodhouse (Kiro) <dwmw@amazon.co.uk>\n---\n drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 6 +++---\n drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +-\n drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 2 +-\n drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 +-\n net/core/filter.c | 2 +-\n net/core/secure_seq.c | 2 +-\n 6 files changed, 8 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c\nindex a14f216048cd..889dc1785772 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c\n@@ -439,7 +439,7 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv,\n \treturn err;\n }\n \n-#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n static int mlx5e_route_lookup_ipv6_get(struct mlx5e_priv *priv,\n \t\t\t\t struct net_device *dev,\n \t\t\t\t struct mlx5e_tc_tun_route_attr *attr)\n@@ -727,7 +727,7 @@ int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv,\n \t\tattr.fl.fl4.daddr = esw_attr->rx_tun_attr->src_ip.v4;\n \t\terr = mlx5e_route_lookup_ipv4_get(priv, filter_dev, &attr);\n \t}\n-#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \telse if (flow_attr->tun_ip_version == 6) {\n \t\t/* Addresses are swapped for decap */\n \t\tattr.fl.fl6.saddr = esw_attr->rx_tun_attr->dst_ip.v6;\n@@ -762,7 +762,7 @@ int mlx5e_tc_tun_route_lookup(struct mlx5e_priv *priv,\n out:\n \tif (flow_attr->tun_ip_version == 4)\n \t\tmlx5e_route_lookup_ipv4_put(&attr);\n-#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \telse if (flow_attr->tun_ip_version == 6)\n \t\tmlx5e_route_lookup_ipv6_put(&attr);\n #endif\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h\nindex 6873c1201803..f3c0e2d0f388 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h\n@@ -73,7 +73,7 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv,\n \t\t\t\t struct net_device *mirred_dev,\n \t\t\t\t struct mlx5e_encap_entry *e);\n \n-#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,\n \t\t\t\t struct net_device *mirred_dev,\n \t\t\t\t struct mlx5e_encap_entry *e);\ndiff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c\nindex bfd401bee9e8..b2973e8a7df8 100644\n--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c\n+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c\n@@ -104,7 +104,7 @@ int mlx5e_tc_set_attr_rx_tun(struct mlx5e_tc_flow *flow,\n \t\tif (!tun_attr->dst_ip.v4 || !tun_attr->src_ip.v4)\n \t\t\treturn 0;\n \t}\n-#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \telse if (ip_version == 6) {\n \t\tint ipv6_size = MLX5_FLD_SZ_BYTES(ipv6_layout, ipv6);\n \ndiff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c\nindex 0cef0e2b85d0..5eb47e1a8d5e 100644\n--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c\n+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c\n@@ -814,7 +814,7 @@ void nfp_tunnel_request_route_v6(struct nfp_app *app, struct sk_buff *skb)\n \tflow.daddr = payload->ipv6_addr;\n \tflow.flowi6_proto = IPPROTO_UDP;\n \n-#if IS_ENABLED(CONFIG_INET) && IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \tdst = ipv6_stub->ipv6_dst_lookup_flow(dev_net(netdev), NULL, &flow,\n \t\t\t\t\t NULL);\n \tif (IS_ERR(dst))\ndiff --git a/net/core/filter.c b/net/core/filter.c\nindex 78b548158fb0..ad71ceefcb5e 100644\n--- a/net/core/filter.c\n+++ b/net/core/filter.c\n@@ -6083,7 +6083,7 @@ static const struct bpf_func_proto bpf_skb_get_xfrm_state_proto = {\n };\n #endif\n \n-#if IS_ENABLED(CONFIG_INET) || IS_ENABLED(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_INET)\n static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params, u32 mtu)\n {\n \tparams->h_vlan_TCI = 0;\ndiff --git a/net/core/secure_seq.c b/net/core/secure_seq.c\nindex 6a6f2cda5aae..4de049635db0 100644\n--- a/net/core/secure_seq.c\n+++ b/net/core/secure_seq.c\n@@ -15,7 +15,7 @@\n #include <linux/siphash.h>\n #include <net/secure_seq.h>\n \n-#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_INET)\n+#if IS_ENABLED(CONFIG_INET)\n #include <linux/in6.h>\n #include <net/tcp.h>\n \n", "prefixes": [ "1/6" ] }