lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: xtables: merge registration structure to NFPROTO_UNSPEC

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt
2010-03-24 22:50:01 +01:00
parent d879e19e18
commit b44672889c
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/netfilter/xt_state.c
View File

@@ -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_IPV4, .family = NFPROTO_UNSPEC,
.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);