Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: br_netfilter: update stub br_nf_pre_routing_ipv6 parameter to `void *priv`.

The real br_nf_pre_routing_ipv6 function, defined when CONFIG_IPV6 is
enabled, expects `void *priv`, not `const struct nf_hook_ops *ops`.
Update the stub br_nf_pre_routing_ipv6, defined when CONFIG_IPV6 is
disabled, to match.

Fixes: 06198b34a3e0 ("netfilter: Pass priv instead of nf_hook_ops to netfilter hooks")
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso
f1815650 22e81d74

+1 -1
+1 -1
include/net/netfilter/br_netfilter.h
··· 68 68 } 69 69 70 70 static inline unsigned int 71 - br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops, struct sk_buff *skb, 71 + br_nf_pre_routing_ipv6(void *priv, struct sk_buff *skb, 72 72 const struct nf_hook_state *state) 73 73 { 74 74 return NF_ACCEPT;