diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-03-24 22:50:01 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-03-25 17:05:10 +0100 |
| commit | b44672889c11e13e4f4dc0a8ee23f0e64f1e57c6 (patch) | |
| tree | 6d293cdabf05a747f2599a5781dedfae8978ee8c | |
| parent | d879e19e18ebc69fc20a9b95612e9dd0acf4d7aa (diff) | |
| download | linux-3.10-b44672889c11e13e4f4dc0a8ee23f0e64f1e57c6.tar.gz linux-3.10-b44672889c11e13e4f4dc0a8ee23f0e64f1e57c6.tar.bz2 linux-3.10-b44672889c11e13e4f4dc0a8ee23f0e64f1e57c6.zip | |
netfilter: xtables: merge registration structure to NFPROTO_UNSPEC
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| -rw-r--r-- | net/netfilter/xt_state.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c index be00d7b1f53..bb1271852d5 100644 --- a/net/netfilter/xt_state.c +++ b/net/netfilter/xt_state.c @@ -53,35 +53,24 @@ static void state_mt_destroy(const struct xt_mtdtor_param *par) nf_ct_l3proto_module_put(par->family); } -static struct xt_match state_mt_reg[] __read_mostly = { - { - .name = "state", - .family = NFPROTO_IPV4, - .checkentry = state_mt_check, - .match = state_mt, - .destroy = state_mt_destroy, - .matchsize = sizeof(struct xt_state_info), - .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 struct xt_match state_mt_reg __read_mostly = { + .name = "state", + .family = NFPROTO_UNSPEC, + .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) { - 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) { - xt_unregister_matches(state_mt_reg, ARRAY_SIZE(state_mt_reg)); + xt_unregister_match(&state_mt_reg); } module_init(state_mt_init); |