diff options
| author |   Jeremy Sowden <jeremy@azazel.net> | 2019-09-13 09:13:13 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-09-13 12:47:11 +0200 |
| commit | f1815650b547db745bef35f74395e113fcf62cac (patch) | |
| tree | 921db62b7c575940a765c91e6e63ed8ecd379b5e /include/net/netfilter | |
| parent | netfilter: conntrack: wrap two inline functions in config checks. (diff) | |
| download | linux-dev-f1815650b547db745bef35f74395e113fcf62cac.tar.xz linux-dev-f1815650b547db745bef35f74395e113fcf62cac.zip | |
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>
Diffstat (limited to 'include/net/netfilter')
| -rw-r--r-- | include/net/netfilter/br_netfilter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/br_netfilter.h b/include/net/netfilter/br_netfilter.h index 2a613c84d49f..c53909fd22cd 100644 --- a/include/net/netfilter/br_netfilter.h +++ b/include/net/netfilter/br_netfilter.h @@ -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; |