aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/netfilter/ebtables.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index ec7709b5c568..4d1cf1492ca4 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -533,8 +533,7 @@ struct ebt_cl_stack
533 */ 533 */
534static inline int 534static inline int
535ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo, 535ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo,
536 struct ebt_entries **hook_entries, unsigned int *n, unsigned int valid_hooks, 536 unsigned int *n, struct ebt_cl_stack *udc)
537 struct ebt_cl_stack *udc)
538{ 537{
539 int i; 538 int i;
540 539
@@ -542,8 +541,6 @@ ebt_get_udc_positions(struct ebt_entry *e, struct ebt_table_info *newinfo,
542 if (e->bitmask) 541 if (e->bitmask)
543 return 0; 542 return 0;
544 for (i = 0; i < NF_BR_NUMHOOKS; i++) { 543 for (i = 0; i < NF_BR_NUMHOOKS; i++) {
545 if ((valid_hooks & (1 << i)) == 0)
546 continue;
547 if (newinfo->hook_entry[i] == (struct ebt_entries *)e) 544 if (newinfo->hook_entry[i] == (struct ebt_entries *)e)
548 break; 545 break;
549 } 546 }
@@ -861,8 +858,7 @@ static int translate_table(struct ebt_replace *repl,
861 return -ENOMEM; 858 return -ENOMEM;
862 i = 0; /* the i'th udc */ 859 i = 0; /* the i'th udc */
863 EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size, 860 EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,
864 ebt_get_udc_positions, newinfo, repl->hook_entry, &i, 861 ebt_get_udc_positions, newinfo, &i, cl_s);
865 repl->valid_hooks, cl_s);
866 /* sanity check */ 862 /* sanity check */
867 if (i != udc_cnt) { 863 if (i != udc_cnt) {
868 BUGPRINT("i != udc_cnt\n"); 864 BUGPRINT("i != udc_cnt\n");