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

Commit f7da79d9 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[EBTABLES]: ebt_check_entry() doesn't need valid_hooks 



We can check newinfo->hook_entry[...] instead.
Kill unused argument.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 177abc34

net/bridge/netfilter/ebtables.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -603,7 +603,7 @@ ebt_cleanup_entry(struct ebt_entry *e, unsigned int *cnt) 




static inline int

static inline int

ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo,

ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo,

   const char *name, unsigned int *cnt, unsigned int valid_hooks,

   const char *name, unsigned int *cnt,

   struct ebt_cl_stack *cl_s, unsigned int udc_cnt)

   struct ebt_cl_stack *cl_s, unsigned int udc_cnt)

{

{

	struct ebt_entry_target *t;

	struct ebt_entry_target *t;
@@ -630,7 +630,7 @@ ebt_check_entry(struct ebt_entry *e, struct ebt_table_info *newinfo, 
	}

	}

	/* what hook do we belong to? */

	/* what hook do we belong to? */

	for (i = 0; i < NF_BR_NUMHOOKS; i++) {

	for (i = 0; i < NF_BR_NUMHOOKS; i++) {

		if ((valid_hooks & (1 << i)) == 0)

		if (!newinfo->hook_entry[i])

			continue;

			continue;

		if ((char *)newinfo->hook_entry[i] < (char *)e)

		if ((char *)newinfo->hook_entry[i] < (char *)e)

			hook = i;

			hook = i;
@@ -889,8 +889,7 @@ static int translate_table(struct ebt_replace *repl, 
	/* used to know what we need to clean up if something goes wrong */

	/* used to know what we need to clean up if something goes wrong */

	i = 0;

	i = 0;

	ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,

	ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,

	   ebt_check_entry, newinfo, repl->name, &i, repl->valid_hooks,

	   ebt_check_entry, newinfo, repl->name, &i, cl_s, udc_cnt);

	   cl_s, udc_cnt);

	if (ret != 0) {

	if (ret != 0) {

		EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,

		EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,

		   ebt_cleanup_entry, &i);

		   ebt_cleanup_entry, &i);