]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
netfilter: br_netfilter: update stub br_nf_pre_routing_ipv6 parameter to `void *priv`.
authorJeremy Sowden <jeremy@azazel.net>
Fri, 13 Sep 2019 08:13:13 +0000 (09:13 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 13 Sep 2019 10:47:11 +0000 (12:47 +0200)
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>
include/net/netfilter/br_netfilter.h

index 2a613c84d49fc7f6986ef0cf3909924c7945774f..c53909fd22cd7b2582d6ea7b23701cf2b382603c 100644 (file)
@@ -68,7 +68,7 @@ static inline int br_validate_ipv6(struct net *net, struct sk_buff *skb)
 }
 
 static inline unsigned int
-br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops, struct sk_buff *skb,
+br_nf_pre_routing_ipv6(void *priv, struct sk_buff *skb,
                       const struct nf_hook_state *state)
 {
        return NF_ACCEPT;