diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2008-10-08 05:35:19 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:19 -0400 |
commit | 6be3d8598e883fb632edf059ba2f8d1b9f4da138 (patch) | |
tree | ef8b3a40168b0f50079d05bd36b7b6f1c4fed9dd /net/ipv6 | |
parent | 9b4fce7a3508a9776534188b6065b206a9608ccf (diff) |
netfilter: xtables: move extension arguments into compound structure (3/6)
This patch does this for match extensions' destroy functions.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 9c843e3777bc..891358e89a2b 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
@@ -599,12 +599,16 @@ mark_source_chains(struct xt_table_info *newinfo, | |||
599 | static int | 599 | static int |
600 | cleanup_match(struct ip6t_entry_match *m, unsigned int *i) | 600 | cleanup_match(struct ip6t_entry_match *m, unsigned int *i) |
601 | { | 601 | { |
602 | struct xt_mtdtor_param par; | ||
603 | |||
602 | if (i && (*i)-- == 0) | 604 | if (i && (*i)-- == 0) |
603 | return 1; | 605 | return 1; |
604 | 606 | ||
605 | if (m->u.kernel.match->destroy) | 607 | par.match = m->u.kernel.match; |
606 | m->u.kernel.match->destroy(m->u.kernel.match, m->data); | 608 | par.matchinfo = m->data; |
607 | module_put(m->u.kernel.match->me); | 609 | if (par.match->destroy != NULL) |
610 | par.match->destroy(&par); | ||
611 | module_put(par.match->me); | ||
608 | return 0; | 612 | return 0; |
609 | } | 613 | } |
610 | 614 | ||