sata_mv: fix pci_enable_msi() error handling

[powerpc.git] / net / netfilter / xt_state.c

diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index 7cd557c..df37b91 100644 (file)
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -44,44 +44,56 @@ match(const struct sk_buff *skb,
        return (sinfo->statemask & statebit);
 }
 
-static struct xt_match state_match = {
-       .name           = "state",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_state_info),
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match state6_match = {
-       .name           = "state",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_state_info),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
-};
-
-static int __init init(void)
+static int check(const char *tablename,
+                const void *inf,
+                const struct xt_match *match,
+                void *matchinfo,
+                unsigned int hook_mask)
 {
-       int ret;
-
-       need_conntrack();
+       if (nf_ct_l3proto_try_module_get(match->family) < 0) {
+               printk(KERN_WARNING "can't load conntrack support for "
+                                   "proto=%d\n", match->family);
+               return 0;
+       }
+       return 1;
+}
 
-       ret = xt_register_match(&state_match);
-       if (ret < 0)
-               return ret;
+static void
+destroy(const struct xt_match *match, void *matchinfo)
+{
+       nf_ct_l3proto_module_put(match->family);
+}
 
-       ret = xt_register_match(&state6_match);
-       if (ret < 0)
-               xt_unregister_match(&state_match);
+static struct xt_match xt_state_match[] = {
+       {
+               .name           = "state",
+               .family         = AF_INET,
+               .checkentry     = check,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_state_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "state",
+               .family         = AF_INET6,
+               .checkentry     = check,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_state_info),
+               .me             = THIS_MODULE,
+       },
+};
 
-       return ret;
+static int __init xt_state_init(void)
+{
+       return xt_register_matches(xt_state_match, ARRAY_SIZE(xt_state_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_state_fini(void)
 {
-       xt_unregister_match(&state_match);
-       xt_unregister_match(&state6_match);
+       xt_unregister_matches(xt_state_match, ARRAY_SIZE(xt_state_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_state_init);
+module_exit(xt_state_fini);