diff options
| author |   Jan Engelhardt <jengelh@medozas.de> | 2010-03-18 00:44:52 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-03-18 14:20:06 +0100 |
| commit | aa5fa3185791aac71c9172d4fda3e8729164b5d1 (patch) | |
| tree | ed49f5c01d7bdb0e994243c3a0888b4a54bb6981 /net/netfilter/xt_state.c | |
| parent | netfilter: xtables: resort osf kconfig text (diff) | |
| download | linux-dev-aa5fa3185791aac71c9172d4fda3e8729164b5d1.tar.xz linux-dev-aa5fa3185791aac71c9172d4fda3e8729164b5d1.zip | |
netfilter: xtables: make use of caller family rather than match family
The matches can have .family = NFPROTO_UNSPEC, and though that is not
the case for the touched modules, it seems better to just use the
nfproto from the caller.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/netfilter/xt_state.c')
| -rw-r--r-- | net/netfilter/xt_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c index 4c946cbd731f..ef09b2e2970f 100644 --- a/net/netfilter/xt_state.c +++ b/net/netfilter/xt_state.c @@ -39,9 +39,9 @@ state_mt(const struct sk_buff *skb, const struct xt_match_param *par) static bool state_mt_check(const struct xt_mtchk_param *par) { - if (nf_ct_l3proto_try_module_get(par->match->family) < 0) { + if (nf_ct_l3proto_try_module_get(par->family) < 0) { printk(KERN_WARNING "can't load conntrack support for " - "proto=%u\n", par->match->family); + "proto=%u\n", par->family); return false; } return true; @@ -49,7 +49,7 @@ static bool state_mt_check(const struct xt_mtchk_param *par) static void state_mt_destroy(const struct xt_mtdtor_param *par) { - nf_ct_l3proto_module_put(par->match->family); + nf_ct_l3proto_module_put(par->family); } static struct xt_match state_mt_reg[] __read_mostly = { |