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 | a2df1648ba615dd5908e9a1fa7b2f133fa302487 (patch) | |
tree | a70a2424cc660903fbcb8120344d80e62df4b0c4 /net/netfilter | |
parent | af5d6dc200eb0fcc6fbd3df1ab4d8969004cb37f (diff) |
netfilter: xtables: move extension arguments into compound structure (6/6)
This patch does this for target extensions' destroy functions.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/xt_CONNMARK.c | 5 | ||||
-rw-r--r-- | net/netfilter/xt_CONNSECMARK.c | 5 | ||||
-rw-r--r-- | net/netfilter/xt_RATEEST.c | 5 | ||||
-rw-r--r-- | net/netfilter/xt_SECMARK.c | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c index 8fc9f35e67df..c5a5072e005d 100644 --- a/net/netfilter/xt_CONNMARK.c +++ b/net/netfilter/xt_CONNMARK.c | |||
@@ -146,10 +146,9 @@ static bool connmark_tg_check(const struct xt_tgchk_param *par) | |||
146 | return true; | 146 | return true; |
147 | } | 147 | } |
148 | 148 | ||
149 | static void | 149 | static void connmark_tg_destroy(const struct xt_tgdtor_param *par) |
150 | connmark_tg_destroy(const struct xt_target *target, void *targinfo) | ||
151 | { | 150 | { |
152 | nf_ct_l3proto_module_put(target->family); | 151 | nf_ct_l3proto_module_put(par->target->family); |
153 | } | 152 | } |
154 | 153 | ||
155 | #ifdef CONFIG_COMPAT | 154 | #ifdef CONFIG_COMPAT |
diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c index 2041a3d4b4d8..b6e3f3f125fd 100644 --- a/net/netfilter/xt_CONNSECMARK.c +++ b/net/netfilter/xt_CONNSECMARK.c | |||
@@ -114,10 +114,9 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par) | |||
114 | return true; | 114 | return true; |
115 | } | 115 | } |
116 | 116 | ||
117 | static void | 117 | static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par) |
118 | connsecmark_tg_destroy(const struct xt_target *target, void *targinfo) | ||
119 | { | 118 | { |
120 | nf_ct_l3proto_module_put(target->family); | 119 | nf_ct_l3proto_module_put(par->target->family); |
121 | } | 120 | } |
122 | 121 | ||
123 | static struct xt_target connsecmark_tg_reg[] __read_mostly = { | 122 | static struct xt_target connsecmark_tg_reg[] __read_mostly = { |
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c index edf4ab1f30ff..43f5676b1af4 100644 --- a/net/netfilter/xt_RATEEST.c +++ b/net/netfilter/xt_RATEEST.c | |||
@@ -139,10 +139,9 @@ err1: | |||
139 | return false; | 139 | return false; |
140 | } | 140 | } |
141 | 141 | ||
142 | static void xt_rateest_tg_destroy(const struct xt_target *target, | 142 | static void xt_rateest_tg_destroy(const struct xt_tgdtor_param *par) |
143 | void *targinfo) | ||
144 | { | 143 | { |
145 | struct xt_rateest_target_info *info = targinfo; | 144 | struct xt_rateest_target_info *info = par->targinfo; |
146 | 145 | ||
147 | xt_rateest_put(info->est); | 146 | xt_rateest_put(info->est); |
148 | } | 147 | } |
diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c index e5777227192c..7a6f9e6f5dfa 100644 --- a/net/netfilter/xt_SECMARK.c +++ b/net/netfilter/xt_SECMARK.c | |||
@@ -113,7 +113,7 @@ static bool secmark_tg_check(const struct xt_tgchk_param *par) | |||
113 | return true; | 113 | return true; |
114 | } | 114 | } |
115 | 115 | ||
116 | static void secmark_tg_destroy(const struct xt_target *target, void *targinfo) | 116 | static void secmark_tg_destroy(const struct xt_tgdtor_param *par) |
117 | { | 117 | { |
118 | switch (mode) { | 118 | switch (mode) { |
119 | case SECMARK_MODE_SEL: | 119 | case SECMARK_MODE_SEL: |