Commit 3bb0362d authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy

[NETFILTER]: remove arpt_(un)register_target indirection macros

Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 95eea855
...@@ -264,11 +264,6 @@ struct arpt_error ...@@ -264,11 +264,6 @@ struct arpt_error
.target.errorname = "ERROR", \ .target.errorname = "ERROR", \
} }
#define arpt_register_target(tgt) \
({ (tgt)->family = NF_ARP; \
xt_register_target(tgt); })
#define arpt_unregister_target(tgt) xt_unregister_target(tgt)
extern struct xt_table *arpt_register_table(struct net *net, extern struct xt_table *arpt_register_table(struct net *net,
struct xt_table *table, struct xt_table *table,
const struct arpt_replace *repl); const struct arpt_replace *repl);
......
...@@ -75,6 +75,7 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target, ...@@ -75,6 +75,7 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target,
static struct xt_target arpt_mangle_reg __read_mostly = { static struct xt_target arpt_mangle_reg __read_mostly = {
.name = "mangle", .name = "mangle",
.family = NF_ARP,
.target = target, .target = target,
.targetsize = sizeof(struct arpt_mangle), .targetsize = sizeof(struct arpt_mangle),
.checkentry = checkentry, .checkentry = checkentry,
...@@ -83,15 +84,12 @@ static struct xt_target arpt_mangle_reg __read_mostly = { ...@@ -83,15 +84,12 @@ static struct xt_target arpt_mangle_reg __read_mostly = {
static int __init arpt_mangle_init(void) static int __init arpt_mangle_init(void)
{ {
if (arpt_register_target(&arpt_mangle_reg)) return xt_register_target(&arpt_mangle_reg);
return -EINVAL;
return 0;
} }
static void __exit arpt_mangle_fini(void) static void __exit arpt_mangle_fini(void)
{ {
arpt_unregister_target(&arpt_mangle_reg); xt_unregister_target(&arpt_mangle_reg);
} }
module_init(arpt_mangle_init); module_init(arpt_mangle_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment