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

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

[EBTABLES]: Clean ebt_get_udc_positions() up. 



Check for valid_hooks is redundant (newinfo->hook_entry[i] will
be NULL if bit i is not set).  Kill it, kill unused arguments.

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

net/bridge/netfilter/ebtables.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -533,8 +533,7 @@ struct ebt_cl_stack 
 */

 */

static inline int

static inline int

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

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

   struct ebt_entries **hook_entries, unsigned int *n, unsigned int valid_hooks,

   unsigned int *n, struct ebt_cl_stack *udc)

   struct ebt_cl_stack *udc)

{

{

	int i;

	int i;
@@ -542,8 +541,6 @@ ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo, 
	if (e->bitmask)

	if (e->bitmask)

		return 0;

		return 0;

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

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

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

			continue;

		if (newinfo->hook_entry[i] == (struct ebt_entries *)e)

		if (newinfo->hook_entry[i] == (struct ebt_entries *)e)

			break;

			break;

	}

	}
@@ -861,8 +858,7 @@ static int translate_table(struct ebt_replace *repl, 
			return -ENOMEM;

			return -ENOMEM;

		i = 0; /* the i'th udc */

		i = 0; /* the i'th udc */

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

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

		   ebt_get_udc_positions, newinfo, repl->hook_entry, &i,

		   ebt_get_udc_positions, newinfo, &i, cl_s);

		   repl->valid_hooks, cl_s);

		/* sanity check */

		/* sanity check */

		if (i != udc_cnt) {

		if (i != udc_cnt) {

			BUGPRINT("i != udc_cnt\n");

			BUGPRINT("i != udc_cnt\n");