summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_netfilter_ipv6.c
diff options
context:
space:
mode:
authorEric W. Biederman2015-09-18 21:33:06 +0200
committerPablo Neira Ayuso2015-09-18 22:00:16 +0200
commit06198b34a3e09e06d9aecaa3727e0d37206cea77 (patch)
tree4fd18327ad7aaaf991b422de0b7ab6ef0ac28acb /net/bridge/br_netfilter_ipv6.c
parentipvs: Read hooknum from state rather than ops->hooknum (diff)
downloadkernel-qcow2-linux-06198b34a3e09e06d9aecaa3727e0d37206cea77.tar.gz
kernel-qcow2-linux-06198b34a3e09e06d9aecaa3727e0d37206cea77.tar.xz
kernel-qcow2-linux-06198b34a3e09e06d9aecaa3727e0d37206cea77.zip
netfilter: Pass priv instead of nf_hook_ops to netfilter hooks
Only pass the void *priv parameter out of the nf_hook_ops. That is all any of the functions are interested now, and by limiting what is passed it becomes simpler to change implementation details. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/br_netfilter_ipv6.c')
-rw-r--r--net/bridge/br_netfilter_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c
index e4dbbe44c724..c51cc3fd50d9 100644
--- a/net/bridge/br_netfilter_ipv6.c
+++ b/net/bridge/br_netfilter_ipv6.c
@@ -218,7 +218,7 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struc
/* Replicate the checks that IPv6 does on packet reception and pass the packet
* to ip6tables.
*/
-unsigned int br_nf_pre_routing_ipv6(const struct nf_hook_ops *ops,
+unsigned int br_nf_pre_routing_ipv6(void *priv,
struct sk_buff *skb,
const struct nf_hook_state *state)
{