summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2015-05-24 01:00:41 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-05-26 18:40:30 +0200
commit2f06550b3b0e26f54045337e34ec2a1b666bb6c6 (patch)
tree2300e6b381098ab3603ecc09f3cc337d3438628d /net/ipv6
parent76d7c457659dfc05d5a23cd0b21fea333d1788cd (diff)
downloadop-kernel-dev-2f06550b3b0e26f54045337e34ec2a1b666bb6c6.zip
op-kernel-dev-2f06550b3b0e26f54045337e34ec2a1b666bb6c6.tar.gz
netfilter: remove unused comefrom hookmask argument
Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_tables.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 1a732a1..d54f049 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -1456,7 +1456,6 @@ static int
compat_find_calc_match(struct xt_entry_match *m,
const char *name,
const struct ip6t_ip6 *ipv6,
- unsigned int hookmask,
int *size)
{
struct xt_match *match;
@@ -1525,8 +1524,7 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e,
entry_offset = (void *)e - (void *)base;
j = 0;
xt_ematch_foreach(ematch, e) {
- ret = compat_find_calc_match(ematch, name,
- &e->ipv6, e->comefrom, &off);
+ ret = compat_find_calc_match(ematch, name, &e->ipv6, &off);
if (ret != 0)
goto release_matches;
++j;
OpenPOWER on IntegriCloud