Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[EBTABLES]: Switch ebt_check_entry_size_and_hooks() to use of newinfo->hook_entry[]

Browse Source 
kill unused arguments

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-11-30 19:27:13 -08:00 committed by David S. Miller
parent 1f072c96fd
commit 0e795531c5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/bridge/netfilter/ebtables.c
View File

@ -464,17 +464,14 @@ static int ebt_verify_pointers(struct ebt_replace *repl,
*/ */
static inline int static inline int
ebt_check_entry_size_and_hooks(struct ebt_entry *e, ebt_check_entry_size_and_hooks(struct ebt_entry *e,
struct ebt_table_info *newinfo, char *base, struct ebt_table_info *newinfo,
struct ebt_entries **hook_entries, unsigned int *n, unsigned int *cnt, unsigned int *n, unsigned int *cnt,
unsigned int *totalcnt, unsigned int *udc_cnt, unsigned int valid_hooks) unsigned int *totalcnt, unsigned int *udc_cnt)
{ {
unsigned int offset = (char *)e - newinfo->entries;
int i; int i;
for (i = 0; i < NF_BR_NUMHOOKS; i++) { for (i = 0; i < NF_BR_NUMHOOKS; i++) {
if ((valid_hooks & (1 << i)) == 0) if ((void *)e == (void *)newinfo->hook_entry[i])
continue;
if ((char *)hook_entries[i] == base + offset)
break; break;
} }
/* beginning of a new chain /* beginning of a new chain
@ -821,9 +818,8 @@ static int translate_table(struct ebt_replace *repl,
newinfo->nentries afterwards */ newinfo->nentries afterwards */
udc_cnt = 0; /* will hold the nr. of user defined chains (udc) */ udc_cnt = 0; /* will hold the nr. of user defined chains (udc) */
ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, ret = EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,
ebt_check_entry_size_and_hooks, newinfo, repl->entries, ebt_check_entry_size_and_hooks, newinfo,
repl->hook_entry, &i, &j, &k, &i, &j, &k, &udc_cnt);
&udc_cnt, repl->valid_hooks);
if (ret != 0) if (ret != 0)
return ret; return ret;