diff options
author | Florian Westphal <fw@strlen.de> | 2015-05-23 19:00:41 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-05-26 12:40:30 -0400 |
commit | 2f06550b3b0e26f54045337e34ec2a1b666bb6c6 (patch) | |
tree | 2300e6b381098ab3603ecc09f3cc337d3438628d /net/ipv6 | |
parent | 76d7c457659dfc05d5a23cd0b21fea333d1788cd (diff) |
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 1a732a1d3c8e..d54f04970ee0 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
@@ -1456,7 +1456,6 @@ static int | |||
1456 | compat_find_calc_match(struct xt_entry_match *m, | 1456 | compat_find_calc_match(struct xt_entry_match *m, |
1457 | const char *name, | 1457 | const char *name, |
1458 | const struct ip6t_ip6 *ipv6, | 1458 | const struct ip6t_ip6 *ipv6, |
1459 | unsigned int hookmask, | ||
1460 | int *size) | 1459 | int *size) |
1461 | { | 1460 | { |
1462 | struct xt_match *match; | 1461 | struct xt_match *match; |
@@ -1525,8 +1524,7 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, | |||
1525 | entry_offset = (void *)e - (void *)base; | 1524 | entry_offset = (void *)e - (void *)base; |
1526 | j = 0; | 1525 | j = 0; |
1527 | xt_ematch_foreach(ematch, e) { | 1526 | xt_ematch_foreach(ematch, e) { |
1528 | ret = compat_find_calc_match(ematch, name, | 1527 | ret = compat_find_calc_match(ematch, name, &e->ipv6, &off); |
1529 | &e->ipv6, e->comefrom, &off); | ||
1530 | if (ret != 0) | 1528 | if (ret != 0) |
1531 | goto release_matches; | 1529 | goto release_matches; |
1532 | ++j; | 1530 | ++j; |