Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
ipv6
/
netfilter
/
ip6table_filter.c
diff --git
a/kernel/net/ipv6/netfilter/ip6table_filter.c
b/kernel/net/ipv6/netfilter/ip6table_filter.c
index
5c33d8a
..
8b277b9
100644
(file)
--- a/
kernel/net/ipv6/netfilter/ip6table_filter.c
+++ b/
kernel/net/ipv6/netfilter/ip6table_filter.c
@@
-32,12
+32,10
@@
static const struct xt_table packet_filter = {
/* The work comes in here from netfilter.c. */
static unsigned int
/* The work comes in here from netfilter.c. */
static unsigned int
-ip6table_filter_hook(
const struct nf_hook_ops *ops
, struct sk_buff *skb,
+ip6table_filter_hook(
void *priv
, struct sk_buff *skb,
const struct nf_hook_state *state)
{
const struct nf_hook_state *state)
{
- const struct net *net = dev_net(state->in ? state->in : state->out);
-
- return ip6t_do_table(skb, ops->hooknum, state, net->ipv6.ip6table_filter);
+ return ip6t_do_table(skb, state, state->net->ipv6.ip6table_filter);
}
static struct nf_hook_ops *filter_ops __read_mostly;
}
static struct nf_hook_ops *filter_ops __read_mostly;