sata_mv: fix pci_enable_msi() error handling

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

diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index 8c011e0..1ab0db6 100644 (file)
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -41,8 +41,7 @@ static void secmark_save(struct sk_buff *skb)
 
                connsecmark = nf_ct_get_secmark(skb, &ctinfo);
                if (connsecmark && !*connsecmark)
-                       if (*connsecmark != skb->secmark)
-                               *connsecmark = skb->secmark;
+                       *connsecmark = skb->secmark;
        }
 }
 
@@ -58,15 +57,14 @@ static void secmark_restore(struct sk_buff *skb)
 
                connsecmark = nf_ct_get_secmark(skb, &ctinfo);
                if (connsecmark && *connsecmark)
-                       if (skb->secmark != *connsecmark)
-                               skb->secmark = *connsecmark;
+                       skb->secmark = *connsecmark;
        }
 }
 
 static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
                           const struct net_device *out, unsigned int hooknum,
                           const struct xt_target *target,
-                          const void *targinfo, void *userinfo)
+                          const void *targinfo)
 {
        struct sk_buff *skb = *pskb;
        const struct xt_connsecmark_target_info *info = targinfo;
@@ -89,10 +87,15 @@ static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
 
 static int checkentry(const char *tablename, const void *entry,
                      const struct xt_target *target, void *targinfo,
-                     unsigned int targinfosize, unsigned int hook_mask)
+                     unsigned int hook_mask)
 {
        struct xt_connsecmark_target_info *info = targinfo;
 
+       if (nf_ct_l3proto_try_module_get(target->family) < 0) {
+               printk(KERN_WARNING "can't load conntrack support for "
+                                   "proto=%d\n", target->family);
+               return 0;
+       }
        switch (info->mode) {
        case CONNSECMARK_SAVE:
        case CONNSECMARK_RESTORE:
@@ -106,49 +109,45 @@ static int checkentry(const char *tablename, const void *entry,
        return 1;
 }
 
-static struct xt_target ipt_connsecmark_reg = {
-       .name           = "CONNSECMARK",
-       .target         = target,
-       .targetsize     = sizeof(struct xt_connsecmark_target_info),
-       .table          = "mangle",
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE,
-       .family         = AF_INET,
-       .revision       = 0,
-};
+static void
+destroy(const struct xt_target *target, void *targinfo)
+{
+       nf_ct_l3proto_module_put(target->family);
+}
 
-static struct xt_target ip6t_connsecmark_reg = {
-       .name           = "CONNSECMARK",
-       .target         = target,
-       .targetsize     = sizeof(struct xt_connsecmark_target_info),
-       .table          = "mangle",
-       .checkentry     = checkentry,
-       .me             = THIS_MODULE,
-       .family         = AF_INET6,
-       .revision       = 0,
+static struct xt_target xt_connsecmark_target[] = {
+       {
+               .name           = "CONNSECMARK",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .destroy        = destroy,
+               .target         = target,
+               .targetsize     = sizeof(struct xt_connsecmark_target_info),
+               .table          = "mangle",
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "CONNSECMARK",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .destroy        = destroy,
+               .target         = target,
+               .targetsize     = sizeof(struct xt_connsecmark_target_info),
+               .table          = "mangle",
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init xt_connsecmark_init(void)
 {
-       int err;
-
-       need_conntrack();
-
-       err = xt_register_target(&ipt_connsecmark_reg);
-       if (err)
-               return err;
-
-       err = xt_register_target(&ip6t_connsecmark_reg);
-       if (err)
-               xt_unregister_target(&ipt_connsecmark_reg);
-
-       return err;
+       return xt_register_targets(xt_connsecmark_target,
+                                  ARRAY_SIZE(xt_connsecmark_target));
 }
 
 static void __exit xt_connsecmark_fini(void)
 {
-       xt_unregister_target(&ip6t_connsecmark_reg);
-       xt_unregister_target(&ipt_connsecmark_reg);
+       xt_unregister_targets(xt_connsecmark_target,
+                             ARRAY_SIZE(xt_connsecmark_target));
 }
 
 module_init(xt_connsecmark_init);