Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2215835/?format=api
{ "id": 2215835, "url": "http://patchwork.ozlabs.org/api/patches/2215835/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260325120928.15848-12-fmancera@suse.de/", "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": "<20260325120928.15848-12-fmancera@suse.de>", "list_archive_url": null, "date": "2026-03-25T12:08:52", "name": "[11/11,net-next,v5] netfilter: remove nf_ipv6_ops and use direct function calls", "commit_ref": null, "pull_url": null, "state": "handled-elsewhere", "archived": true, "hash": "84bfd05a8318dfa64edbf84369f1f01706600e05", "submitter": { "id": 90904, "url": "http://patchwork.ozlabs.org/api/people/90904/?format=api", "name": "Fernando Fernandez Mancera", "email": "fmancera@suse.de" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260325120928.15848-12-fmancera@suse.de/mbox/", "series": [ { "id": 497434, "url": "http://patchwork.ozlabs.org/api/series/497434/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=497434", "date": "2026-03-25T12:08:52", "name": "[01/11,net-next,v5] ipv6: convert CONFIG_IPV6 to built-in only and clean up Kconfigs", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/497434/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2215835/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2215835/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <netfilter-devel+bounces-11393-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 spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-11393-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=195.135.223.131", "smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=suse.de", "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=suse.de", "smtp-out2.suse.de;\n\tnone" ], "Received": [ "from tor.lore.kernel.org (tor.lore.kernel.org\n [IPv6:2600:3c04:e001:36c::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 4fgmZ627XPz1y1K\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 25 Mar 2026 23:34:38 +1100 (AEDT)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 4AAAC300D6AC\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 25 Mar 2026 12:13:25 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id A961F3DB620;\n\tWed, 25 Mar 2026 12:11:28 +0000 (UTC)", "from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 8854E3DA7FB\n\tfor <netfilter-devel@vger.kernel.org>; Wed, 25 Mar 2026 12:11:26 +0000 (UTC)", "from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org\n [IPv6:2a07:de40:b281:104:10:150:64:97])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby smtp-out2.suse.de (Postfix) with ESMTPS id 0ABA15BCD0;\n\tWed, 25 Mar 2026 12:11:25 +0000 (UTC)", "from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0407F443BE;\n\tWed, 25 Mar 2026 12:11:23 +0000 (UTC)", "from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n\tby imap1.dmz-prg2.suse.org with ESMTPSA\n\tid mO2VOevQw2kbNgAAD6G6ig\n\t(envelope-from <fmancera@suse.de>); Wed, 25 Mar 2026 12:11:23 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1774440688; cv=none;\n b=sTpTS7hzXYng/5+1VGrCNbiqVir6hVaZbVMD3u6U7xwBqHknfkgBwBjZonhESRA45N08BRM8wqQg1lbJX1SVfpa9/XXS6m5Pda95fFAPXiz+yXohEKoASwHsiDB5diBaf1buP/QFHF0zTRcHG3PG70Q2ekWY0Nrd4EDkfdQN0o8=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1774440688; c=relaxed/simple;\n\tbh=zu3aLA0rvDaDrhmPPuqjpIE3CrfmdSxcAd9b1qb2ZYQ=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=jTv6ZFAazuB3A89QpdeiGB6IDchRIuxTjc/7yRX7FPdCVFKJoJqA8Z6HVRwnljpuE4jtl0fxpafYrfPbj7sEKeCPthu1H/CueQ2cIuKUgtSFOgHgONGM3e7+W9HFVy8lJRZF/ZHrivWY0tkDQARQ97GmdOi2HxOgfY+3L06/alg=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=suse.de;\n spf=pass smtp.mailfrom=suse.de; arc=none smtp.client-ip=195.135.223.131", "From": "Fernando Fernandez Mancera <fmancera@suse.de>", "To": "netdev@vger.kernel.org", "Cc": "Fernando Fernandez Mancera <fmancera@suse.de>, =?utf-8?q?Ricardo_B=2E_Ma?=\n\t=?utf-8?q?rli=C3=A8re?= <rbm@suse.com>,\n Pablo Neira Ayuso <pablo@netfilter.org>, Florian Westphal <fw@strlen.de>,\n Phil Sutter <phil@nwl.cc>, Nikolay Aleksandrov <razor@blackwall.org>,\n Ido Schimmel <idosch@nvidia.com>, \"David S. Miller\" <davem@davemloft.net>,\n Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>,\n Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,\n David Ahern <dsahern@kernel.org>, netfilter-devel@vger.kernel.org,\n coreteam@netfilter.org, linux-kernel@vger.kernel.org, bridge@lists.linux.dev", "Subject": "[PATCH 11/11 net-next v5] netfilter: remove nf_ipv6_ops and use\n direct function calls", "Date": "Wed, 25 Mar 2026 13:08:52 +0100", "Message-ID": "<20260325120928.15848-12-fmancera@suse.de>", "X-Mailer": "git-send-email 2.51.0", "In-Reply-To": "<20260325120928.15848-1-fmancera@suse.de>", "References": "<20260325120928.15848-1-fmancera@suse.de>", "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-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Rspamd-Pre-Result": [ "action=no action;\n\tmodule=replies;\n\tMessage is reply to one we originated", "action=no action;\n\tmodule=replies;\n\tMessage is reply to one we originated" ], "X-Rspamd-Queue-Id": "0ABA15BCD0", "X-Rspamd-Action": "no action", "X-Spam-Score": "-4.00", "X-Spam-Level": "", "X-Spam-Flag": "NO", "X-Spamd-Result": "default: False [-4.00 / 50.00];\n\tREPLY(-4.00)[]", "X-Rspamd-Server": "rspamd1.dmz-prg2.suse.org" }, "content": "As IPv6 is built-in only, nf_ipv6_ops can be removed completely as it is\nnot longer necessary.\n\nConvert all nf_ipv6_ops usage to direct function calls instead. In\naddition, remove the ipv6_netfilter_init/fini() functions as they are\nnot necessary any longer.\n\nSigned-off-by: Fernando Fernandez Mancera <fmancera@suse.de>\nTested-by: Ricardo B. Marlière <rbm@suse.com>\n---\n include/linux/netfilter_ipv6.h | 102 ++----------------------------\n net/bridge/br_netfilter_hooks.c | 12 +---\n net/bridge/br_netfilter_ipv6.c | 7 +-\n net/ipv6/af_inet6.c | 6 --\n net/ipv6/netfilter.c | 48 --------------\n net/netfilter/core.c | 3 -\n net/netfilter/nf_nat_masquerade.c | 21 +-----\n net/netfilter/nfnetlink_queue.c | 22 +++++--\n net/netfilter/utils.c | 1 -\n 9 files changed, 32 insertions(+), 190 deletions(-)", "diff": "diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h\nindex 61aa48f46dd7..5ce45b6d890f 100644\n--- a/include/linux/netfilter_ipv6.h\n+++ b/include/linux/netfilter_ipv6.h\n@@ -34,59 +34,13 @@ struct ip6_rt_info {\n struct nf_queue_entry;\n struct nf_bridge_frag_data;\n \n-/*\n- * Hook functions for ipv6 to allow xt_* modules to be built-in even\n- * if IPv6 is a module.\n- */\n-struct nf_ipv6_ops {\n-#if IS_MODULE(CONFIG_IPV6)\n-\tint (*chk_addr)(struct net *net, const struct in6_addr *addr,\n-\t\t\tconst struct net_device *dev, int strict);\n-\tint (*route_me_harder)(struct net *net, struct sock *sk, struct sk_buff *skb);\n-\tint (*dev_get_saddr)(struct net *net, const struct net_device *dev,\n-\t\t const struct in6_addr *daddr, unsigned int srcprefs,\n-\t\t struct in6_addr *saddr);\n-\tint (*route)(struct net *net, struct dst_entry **dst, struct flowi *fl,\n-\t\t bool strict);\n-\tu32 (*cookie_init_sequence)(const struct ipv6hdr *iph,\n-\t\t\t\t const struct tcphdr *th, u16 *mssp);\n-\tint (*cookie_v6_check)(const struct ipv6hdr *iph,\n-\t\t\t const struct tcphdr *th);\n-#endif\n-\tvoid (*route_input)(struct sk_buff *skb);\n-\tint (*fragment)(struct net *net, struct sock *sk, struct sk_buff *skb,\n-\t\t\tint (*output)(struct net *, struct sock *, struct sk_buff *));\n-\tint (*reroute)(struct sk_buff *skb, const struct nf_queue_entry *entry);\n-#if IS_MODULE(CONFIG_IPV6)\n-\tint (*br_fragment)(struct net *net, struct sock *sk,\n-\t\t\t struct sk_buff *skb,\n-\t\t\t struct nf_bridge_frag_data *data,\n-\t\t\t int (*output)(struct net *, struct sock *sk,\n-\t\t\t\t\t const struct nf_bridge_frag_data *data,\n-\t\t\t\t\t struct sk_buff *));\n-#endif\n-};\n-\n #ifdef CONFIG_NETFILTER\n #include <net/addrconf.h>\n \n-extern const struct nf_ipv6_ops __rcu *nf_ipv6_ops;\n-static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void)\n-{\n-\treturn rcu_dereference(nf_ipv6_ops);\n-}\n-\n static inline int nf_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,\n \t\t\t\t const struct net_device *dev, int strict)\n {\n-#if IS_MODULE(CONFIG_IPV6)\n-\tconst struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops();\n-\n-\tif (!v6_ops)\n-\t\treturn 1;\n-\n-\treturn v6_ops->chk_addr(net, addr, dev, strict);\n-#elif IS_BUILTIN(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \treturn ipv6_chk_addr(net, addr, dev, strict);\n #else\n \treturn 1;\n@@ -99,15 +53,7 @@ int __nf_ip6_route(struct net *net, struct dst_entry **dst,\n static inline int nf_ip6_route(struct net *net, struct dst_entry **dst,\n \t\t\t struct flowi *fl, bool strict)\n {\n-#if IS_MODULE(CONFIG_IPV6)\n-\tconst struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();\n-\n-\tif (v6ops)\n-\t\treturn v6ops->route(net, dst, fl, strict);\n-\n-\treturn -EHOSTUNREACH;\n-#endif\n-#if IS_BUILTIN(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \treturn __nf_ip6_route(net, dst, fl, strict);\n #else\n \treturn -EHOSTUNREACH;\n@@ -129,14 +75,7 @@ static inline int nf_br_ip6_fragment(struct net *net, struct sock *sk,\n \t\t\t\t\t\t const struct nf_bridge_frag_data *data,\n \t\t\t\t\t\t struct sk_buff *))\n {\n-#if IS_MODULE(CONFIG_IPV6)\n-\tconst struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops();\n-\n-\tif (!v6_ops)\n-\t\treturn 1;\n-\n-\treturn v6_ops->br_fragment(net, sk, skb, data, output);\n-#elif IS_BUILTIN(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \treturn br_ip6_fragment(net, sk, skb, data, output);\n #else\n \treturn 1;\n@@ -147,14 +86,7 @@ int ip6_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb);\n \n static inline int nf_ip6_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb)\n {\n-#if IS_MODULE(CONFIG_IPV6)\n-\tconst struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops();\n-\n-\tif (!v6_ops)\n-\t\treturn -EHOSTUNREACH;\n-\n-\treturn v6_ops->route_me_harder(net, sk, skb);\n-#elif IS_BUILTIN(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6)\n \treturn ip6_route_me_harder(net, sk, skb);\n #else\n \treturn -EHOSTUNREACH;\n@@ -165,15 +97,8 @@ static inline u32 nf_ipv6_cookie_init_sequence(const struct ipv6hdr *iph,\n \t\t\t\t\t const struct tcphdr *th,\n \t\t\t\t\t u16 *mssp)\n {\n-#if IS_ENABLED(CONFIG_SYN_COOKIES)\n-#if IS_MODULE(CONFIG_IPV6)\n-\tconst struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops();\n-\n-\tif (v6_ops)\n-\t\treturn v6_ops->cookie_init_sequence(iph, th, mssp);\n-#elif IS_BUILTIN(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6) && IS_ENABLED(CONFIG_SYN_COOKIES)\n \treturn __cookie_v6_init_sequence(iph, th, mssp);\n-#endif\n #endif\n \treturn 0;\n }\n@@ -181,15 +106,8 @@ static inline u32 nf_ipv6_cookie_init_sequence(const struct ipv6hdr *iph,\n static inline int nf_cookie_v6_check(const struct ipv6hdr *iph,\n \t\t\t\t const struct tcphdr *th)\n {\n-#if IS_ENABLED(CONFIG_SYN_COOKIES)\n-#if IS_MODULE(CONFIG_IPV6)\n-\tconst struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops();\n-\n-\tif (v6_ops)\n-\t\treturn v6_ops->cookie_v6_check(iph, th);\n-#elif IS_BUILTIN(CONFIG_IPV6)\n+#if IS_ENABLED(CONFIG_IPV6) && IS_ENABLED(CONFIG_SYN_COOKIES)\n \treturn __cookie_v6_check(iph, th);\n-#endif\n #endif\n \treturn 0;\n }\n@@ -198,14 +116,6 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,\n \t\t\tunsigned int dataoff, u_int8_t protocol);\n \n int nf_ip6_check_hbh_len(struct sk_buff *skb, u32 *plen);\n-\n-int ipv6_netfilter_init(void);\n-void ipv6_netfilter_fini(void);\n-\n-#else /* CONFIG_NETFILTER */\n-static inline int ipv6_netfilter_init(void) { return 0; }\n-static inline void ipv6_netfilter_fini(void) { return; }\n-static inline const struct nf_ipv6_ops *nf_get_ipv6_ops(void) { return NULL; }\n #endif /* CONFIG_NETFILTER */\n \n #endif /*__LINUX_IP6_NETFILTER_H*/\ndiff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c\nindex 083e2fe96441..0ab1c94db4b9 100644\n--- a/net/bridge/br_netfilter_hooks.c\n+++ b/net/bridge/br_netfilter_hooks.c\n@@ -32,6 +32,7 @@\n \n #include <net/ip.h>\n #include <net/ipv6.h>\n+#include <net/ip6_route.h>\n #include <net/addrconf.h>\n #include <net/dst_metadata.h>\n #include <net/route.h>\n@@ -890,7 +891,6 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff\n \t}\n \tif (IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) &&\n \t skb->protocol == htons(ETH_P_IPV6)) {\n-\t\tconst struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();\n \t\tstruct brnf_frag_data *data;\n \n \t\tif (br_validate_ipv6(net, skb))\n@@ -906,15 +906,9 @@ static int br_nf_dev_queue_xmit(struct net *net, struct sock *sk, struct sk_buff\n \t\tskb_copy_from_linear_data_offset(skb, -data->size, data->mac,\n \t\t\t\t\t\t data->size);\n \n-\t\tif (v6ops) {\n-\t\t\tret = v6ops->fragment(net, sk, skb, br_nf_push_frag_xmit);\n-\t\t\tlocal_unlock_nested_bh(&brnf_frag_data_storage.bh_lock);\n-\t\t\treturn ret;\n-\t\t}\n+\t\tret = ip6_fragment(net, sk, skb, br_nf_push_frag_xmit);\n \t\tlocal_unlock_nested_bh(&brnf_frag_data_storage.bh_lock);\n-\n-\t\tkfree_skb(skb);\n-\t\treturn -EMSGSIZE;\n+\t\treturn ret;\n \t}\n \tnf_bridge_info_free(skb);\n \treturn br_dev_queue_push_xmit(net, sk, skb);\ndiff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c\nindex 76ce70b4e7f3..d8548428929e 100644\n--- a/net/bridge/br_netfilter_ipv6.c\n+++ b/net/bridge/br_netfilter_ipv6.c\n@@ -30,6 +30,7 @@\n \n #include <net/ip.h>\n #include <net/ipv6.h>\n+#include <net/ip6_route.h>\n #include <net/addrconf.h>\n #include <net/route.h>\n #include <net/netfilter/br_netfilter.h>\n@@ -95,15 +96,13 @@ br_nf_ipv6_daddr_was_changed(const struct sk_buff *skb,\n \n /* PF_BRIDGE/PRE_ROUTING: Undo the changes made for ip6tables\n * PREROUTING and continue the bridge PRE_ROUTING hook. See comment\n- * for br_nf_pre_routing_finish(), same logic is used here but\n- * equivalent IPv6 function ip6_route_input() called indirectly.\n+ * for br_nf_pre_routing_finish(), same logic is used here.\n */\n static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struct sk_buff *skb)\n {\n \tstruct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);\n \tstruct rtable *rt;\n \tstruct net_device *dev = skb->dev, *br_indev;\n-\tconst struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();\n \n \tbr_indev = nf_bridge_get_physindev(skb, net);\n \tif (!br_indev) {\n@@ -120,7 +119,7 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struc\n \tnf_bridge->in_prerouting = 0;\n \tif (br_nf_ipv6_daddr_was_changed(skb, nf_bridge)) {\n \t\tskb_dst_drop(skb);\n-\t\tv6ops->route_input(skb);\n+\t\tip6_route_input(skb);\n \n \t\tif (skb_dst(skb)->error) {\n \t\t\tkfree_skb(skb);\ndiff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c\nindex 33abd8d8cd7d..ee341a8254bf 100644\n--- a/net/ipv6/af_inet6.c\n+++ b/net/ipv6/af_inet6.c\n@@ -38,7 +38,6 @@\n #include <linux/inet.h>\n #include <linux/netdevice.h>\n #include <linux/icmpv6.h>\n-#include <linux/netfilter_ipv6.h>\n \n #include <net/ip.h>\n #include <net/ipv6.h>\n@@ -1066,9 +1065,6 @@ static int __init inet6_init(void)\n \tif (err)\n \t\tgoto igmp_fail;\n \n-\terr = ipv6_netfilter_init();\n-\tif (err)\n-\t\tgoto netfilter_fail;\n \t/* Create /proc/foo6 entries. */\n #ifdef CONFIG_PROC_FS\n \terr = -ENOMEM;\n@@ -1199,8 +1195,6 @@ static int __init inet6_init(void)\n \traw6_proc_exit();\n proc_raw6_fail:\n #endif\n-\tipv6_netfilter_fini();\n-netfilter_fail:\n \tigmp6_cleanup();\n igmp_fail:\n \tndisc_cleanup();\ndiff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c\nindex c3dc90dfab80..6d80f85e55fa 100644\n--- a/net/ipv6/netfilter.c\n+++ b/net/ipv6/netfilter.c\n@@ -86,21 +86,6 @@ int ip6_route_me_harder(struct net *net, struct sock *sk_partial, struct sk_buff\n }\n EXPORT_SYMBOL(ip6_route_me_harder);\n \n-static int nf_ip6_reroute(struct sk_buff *skb,\n-\t\t\t const struct nf_queue_entry *entry)\n-{\n-\tstruct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry);\n-\n-\tif (entry->state.hook == NF_INET_LOCAL_OUT) {\n-\t\tconst struct ipv6hdr *iph = ipv6_hdr(skb);\n-\t\tif (!ipv6_addr_equal(&iph->daddr, &rt_info->daddr) ||\n-\t\t !ipv6_addr_equal(&iph->saddr, &rt_info->saddr) ||\n-\t\t skb->mark != rt_info->mark)\n-\t\t\treturn ip6_route_me_harder(entry->state.net, entry->state.sk, skb);\n-\t}\n-\treturn 0;\n-}\n-\n int __nf_ip6_route(struct net *net, struct dst_entry **dst,\n \t\t struct flowi *fl, bool strict)\n {\n@@ -243,36 +228,3 @@ int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,\n \treturn 0;\n }\n EXPORT_SYMBOL_GPL(br_ip6_fragment);\n-\n-static const struct nf_ipv6_ops ipv6ops = {\n-#if IS_MODULE(CONFIG_IPV6)\n-\t.chk_addr\t\t= ipv6_chk_addr,\n-\t.route_me_harder\t= ip6_route_me_harder,\n-\t.dev_get_saddr\t\t= ipv6_dev_get_saddr,\n-\t.route\t\t\t= __nf_ip6_route,\n-#if IS_ENABLED(CONFIG_SYN_COOKIES)\n-\t.cookie_init_sequence\t= __cookie_v6_init_sequence,\n-\t.cookie_v6_check\t= __cookie_v6_check,\n-#endif\n-#endif\n-\t.route_input\t\t= ip6_route_input,\n-\t.fragment\t\t= ip6_fragment,\n-\t.reroute\t\t= nf_ip6_reroute,\n-#if IS_MODULE(CONFIG_IPV6)\n-\t.br_fragment\t\t= br_ip6_fragment,\n-#endif\n-};\n-\n-int __init ipv6_netfilter_init(void)\n-{\n-\tRCU_INIT_POINTER(nf_ipv6_ops, &ipv6ops);\n-\treturn 0;\n-}\n-\n-/* This can be called from inet6_init() on errors, so it cannot\n- * be marked __exit. -DaveM\n- */\n-void ipv6_netfilter_fini(void)\n-{\n-\tRCU_INIT_POINTER(nf_ipv6_ops, NULL);\n-}\ndiff --git a/net/netfilter/core.c b/net/netfilter/core.c\nindex d5df44ea9e7b..675a1034b340 100644\n--- a/net/netfilter/core.c\n+++ b/net/netfilter/core.c\n@@ -27,9 +27,6 @@\n \n #include \"nf_internals.h\"\n \n-const struct nf_ipv6_ops __rcu *nf_ipv6_ops __read_mostly;\n-EXPORT_SYMBOL_GPL(nf_ipv6_ops);\n-\n #ifdef CONFIG_JUMP_LABEL\n struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];\n EXPORT_SYMBOL(nf_hooks_needed);\ndiff --git a/net/netfilter/nf_nat_masquerade.c b/net/netfilter/nf_nat_masquerade.c\nindex a5a23c03fda9..4de6e0a51701 100644\n--- a/net/netfilter/nf_nat_masquerade.c\n+++ b/net/netfilter/nf_nat_masquerade.c\n@@ -220,23 +220,6 @@ static struct notifier_block masq_inet_notifier = {\n };\n \n #if IS_ENABLED(CONFIG_IPV6)\n-static int\n-nat_ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,\n-\t\t const struct in6_addr *daddr, unsigned int srcprefs,\n-\t\t struct in6_addr *saddr)\n-{\n-#ifdef CONFIG_IPV6_MODULE\n-\tconst struct nf_ipv6_ops *v6_ops = nf_get_ipv6_ops();\n-\n-\tif (!v6_ops)\n-\t\treturn -EHOSTUNREACH;\n-\n-\treturn v6_ops->dev_get_saddr(net, dev, daddr, srcprefs, saddr);\n-#else\n-\treturn ipv6_dev_get_saddr(net, dev, daddr, srcprefs, saddr);\n-#endif\n-}\n-\n unsigned int\n nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,\n \t\t const struct net_device *out)\n@@ -251,8 +234,8 @@ nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range,\n \tWARN_ON(!(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||\n \t\t\t ctinfo == IP_CT_RELATED_REPLY)));\n \n-\tif (nat_ipv6_dev_get_saddr(nf_ct_net(ct), out,\n-\t\t\t\t &ipv6_hdr(skb)->daddr, 0, &src) < 0)\n+\tif (ipv6_dev_get_saddr(nf_ct_net(ct), out,\n+\t\t\t &ipv6_hdr(skb)->daddr, 0, &src) < 0)\n \t\treturn NF_DROP;\n \n \tnat = nf_ct_nat_ext_add(ct);\ndiff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c\nindex a91ae07db059..2aa2380d976a 100644\n--- a/net/netfilter/nfnetlink_queue.c\n+++ b/net/netfilter/nfnetlink_queue.c\n@@ -356,9 +356,25 @@ static int nf_ip_reroute(struct sk_buff *skb, const struct nf_queue_entry *entry\n \treturn 0;\n }\n \n+static int nf_ip6_reroute(struct sk_buff *skb,\n+\t\t\t const struct nf_queue_entry *entry)\n+{\n+\tstruct ip6_rt_info *rt_info = nf_queue_entry_reroute(entry);\n+\n+\tif (entry->state.hook == NF_INET_LOCAL_OUT) {\n+\t\tconst struct ipv6hdr *iph = ipv6_hdr(skb);\n+\n+\t\tif (!ipv6_addr_equal(&iph->daddr, &rt_info->daddr) ||\n+\t\t !ipv6_addr_equal(&iph->saddr, &rt_info->saddr) ||\n+\t\t skb->mark != rt_info->mark)\n+\t\t\treturn nf_ip6_route_me_harder(entry->state.net,\n+\t\t\t\t\t\t entry->state.sk, skb);\n+\t}\n+\treturn 0;\n+}\n+\n static int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry)\n {\n-\tconst struct nf_ipv6_ops *v6ops;\n \tint ret = 0;\n \n \tswitch (entry->state.pf) {\n@@ -366,9 +382,7 @@ static int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry)\n \t\tret = nf_ip_reroute(skb, entry);\n \t\tbreak;\n \tcase AF_INET6:\n-\t\tv6ops = rcu_dereference(nf_ipv6_ops);\n-\t\tif (v6ops)\n-\t\t\tret = v6ops->reroute(skb, entry);\n+\t\tret = nf_ip6_reroute(skb, entry);\n \t\tbreak;\n \t}\n \treturn ret;\ndiff --git a/net/netfilter/utils.c b/net/netfilter/utils.c\nindex 008419db815a..29c4dcc362c7 100644\n--- a/net/netfilter/utils.c\n+++ b/net/netfilter/utils.c\n@@ -163,7 +163,6 @@ EXPORT_SYMBOL_GPL(nf_checksum_partial);\n int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl,\n \t bool strict, unsigned short family)\n {\n-\tconst struct nf_ipv6_ops *v6ops __maybe_unused;\n \tint ret = 0;\n \n \tswitch (family) {\n", "prefixes": [ "11/11", "net-next", "v5" ] }