Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f06550b authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: remove unused comefrom hookmask argument 



Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 76d7c457

net/ipv4/netfilter/ip_tables.c

+1 −3
Original line number Diff line number Diff line
@@ -1441,7 +1441,6 @@ static int 
compat_find_calc_match(struct xt_entry_match *m,

		       const char *name,

		       const struct ipt_ip *ip,

		       unsigned int hookmask,

		       int *size)

{

	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;

	j = 0;

	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)

			goto release_matches;

		++j;

net/ipv6/netfilter/ip6_tables.c

+1 −3
Original line number Diff line number Diff line
@@ -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;