Browse Source

netfilter: remove unused comefrom hookmask argument

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Florian Westphal 10 years ago
parent
commit
2f06550b3b
2 changed files with 2 additions and 6 deletions
  1. 1 3
      net/ipv4/netfilter/ip_tables.c
  2. 1 3
      net/ipv6/netfilter/ip6_tables.c

+ 1 - 3
net/ipv4/netfilter/ip_tables.c

@@ -1441,7 +1441,6 @@ static int
 compat_find_calc_match(struct xt_entry_match *m,
 compat_find_calc_match(struct xt_entry_match *m,
 		       const char *name,
 		       const char *name,
 		       const struct ipt_ip *ip,
 		       const struct ipt_ip *ip,
-		       unsigned int hookmask,
 		       int *size)
 		       int *size)
 {
 {
 	struct xt_match *match;
 	struct xt_match *match;
@@ -1510,8 +1509,7 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e,
 	entry_offset = (void *)e - (void *)base;
 	entry_offset = (void *)e - (void *)base;
 	j = 0;
 	j = 0;
 	xt_ematch_foreach(ematch, e) {
 	xt_ematch_foreach(ematch, e) {
-		ret = compat_find_calc_match(ematch, name,
-					     &e->ip, e->comefrom, &off);
+		ret = compat_find_calc_match(ematch, name, &e->ip, &off);
 		if (ret != 0)
 		if (ret != 0)
 			goto release_matches;
 			goto release_matches;
 		++j;
 		++j;

+ 1 - 3
net/ipv6/netfilter/ip6_tables.c

@@ -1456,7 +1456,6 @@ static int
 compat_find_calc_match(struct xt_entry_match *m,
 compat_find_calc_match(struct xt_entry_match *m,
 		       const char *name,
 		       const char *name,
 		       const struct ip6t_ip6 *ipv6,
 		       const struct ip6t_ip6 *ipv6,
-		       unsigned int hookmask,
 		       int *size)
 		       int *size)
 {
 {
 	struct xt_match *match;
 	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;
 	entry_offset = (void *)e - (void *)base;
 	j = 0;
 	j = 0;
 	xt_ematch_foreach(ematch, e) {
 	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)
 		if (ret != 0)
 			goto release_matches;
 			goto release_matches;
 		++j;
 		++j;