diff options
| author | Eric W. Biederman | 2015-09-18 21:32:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-09-18 21:57:43 +0200 |
| commit | 6cb8ff3f1a535b1d8eb5ea318932513d08eb3da7 (patch) | |
| tree | 43c650c14b2738ad9aa0bdf32d475ddadcab57a5 /net/ipv6/netfilter/ip6table_filter.c | |
| parent | netfilter: ebtables: Simplify the arguments to ebt_do_table (diff) | |
| download | kernel-qcow2-linux-6cb8ff3f1a535b1d8eb5ea318932513d08eb3da7.tar.gz kernel-qcow2-linux-6cb8ff3f1a535b1d8eb5ea318932513d08eb3da7.tar.xz kernel-qcow2-linux-6cb8ff3f1a535b1d8eb5ea318932513d08eb3da7.zip | |
inet netfilter: Remove hook from ip6t_do_table, arp_do_table, ipt_do_table
The values of ops->hooknum and state->hook are guaraneted to be equal
making the hook argument to ip6t_do_table, arp_do_table, and
ipt_do_table is unnecessary. Remove the unnecessary hook argument.
In the callers use state->hook instead of ops->hooknum for clarity and
to reduce the number of cachelines the callers touch.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv6/netfilter/ip6table_filter.c')
| -rw-r--r-- | net/ipv6/netfilter/ip6table_filter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c index 2449005fb5dc..a7327f61b90c 100644 --- a/net/ipv6/netfilter/ip6table_filter.c +++ b/net/ipv6/netfilter/ip6table_filter.c @@ -35,8 +35,7 @@ static unsigned int ip6table_filter_hook(const struct nf_hook_ops *ops, struct sk_buff *skb, const struct nf_hook_state *state) { - return ip6t_do_table(skb, ops->hooknum, state, - 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; |