Commit b4467288 authored by Jan Engelhardt's avatar Jan Engelhardt

netfilter: xtables: merge registration structure to NFPROTO_UNSPEC

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent d879e19e
...@@ -53,35 +53,24 @@ static void state_mt_destroy(const struct xt_mtdtor_param *par) ...@@ -53,35 +53,24 @@ static void state_mt_destroy(const struct xt_mtdtor_param *par)
nf_ct_l3proto_module_put(par->family); nf_ct_l3proto_module_put(par->family);
} }
static struct xt_match state_mt_reg[] __read_mostly = { static struct xt_match state_mt_reg __read_mostly = {
{ .name = "state",
.name = "state", .family = NFPROTO_UNSPEC,
.family = NFPROTO_IPV4, .checkentry = state_mt_check,
.checkentry = state_mt_check, .match = state_mt,
.match = state_mt, .destroy = state_mt_destroy,
.destroy = state_mt_destroy, .matchsize = sizeof(struct xt_state_info),
.matchsize = sizeof(struct xt_state_info), .me = THIS_MODULE,
.me = THIS_MODULE,
},
{
.name = "state",
.family = NFPROTO_IPV6,
.checkentry = state_mt_check,
.match = state_mt,
.destroy = state_mt_destroy,
.matchsize = sizeof(struct xt_state_info),
.me = THIS_MODULE,
},
}; };
static int __init state_mt_init(void) static int __init state_mt_init(void)
{ {
return xt_register_matches(state_mt_reg, ARRAY_SIZE(state_mt_reg)); return xt_register_match(&state_mt_reg);
} }
static void __exit state_mt_exit(void) static void __exit state_mt_exit(void)
{ {
xt_unregister_matches(state_mt_reg, ARRAY_SIZE(state_mt_reg)); xt_unregister_match(&state_mt_reg);
} }
module_init(state_mt_init); module_init(state_mt_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