Merge branch 'upstream' into upstream-jgarzik

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

diff --git a/net/netfilter/xt_NOTRACK.c b/net/netfilter/xt_NOTRACK.c
index cf2ebd7..b874a20 100644 (file)
--- a/net/netfilter/xt_NOTRACK.c
+++ b/net/netfilter/xt_NOTRACK.c
@@ -16,15 +16,14 @@ target(struct sk_buff **pskb,
        const struct net_device *out,
        unsigned int hooknum,
        const struct xt_target *target,
-       const void *targinfo,
-       void *userinfo)
+       const void *targinfo)
 {
        /* Previously seen (loopback)? Ignore. */
        if ((*pskb)->nfct != NULL)
                return XT_CONTINUE;
 
-       /* Attach fake conntrack entry. 
-          If there is a real ct entry correspondig to this packet, 
+       /* Attach fake conntrack entry.
+          If there is a real ct entry correspondig to this packet,
           it'll hang aroun till timing out. We don't deal with it
           for performance reasons. JK */
        nf_ct_untrack(*pskb);
@@ -34,44 +33,33 @@ target(struct sk_buff **pskb,
        return XT_CONTINUE;
 }
 
-static struct xt_target notrack_reg = {
-       .name           = "NOTRACK",
-       .target         = target,
-       .targetsize     = 0,
-       .table          = "raw",
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
+static struct xt_target xt_notrack_target[] = {
+       {
+               .name           = "NOTRACK",
+               .family         = AF_INET,
+               .target         = target,
+               .table          = "raw",
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "NOTRACK",
+               .family         = AF_INET6,
+               .target         = target,
+               .table          = "raw",
+               .me             = THIS_MODULE,
+       },
 };
 
-static struct xt_target notrack6_reg = {
-       .name           = "NOTRACK",
-       .target         = target,
-       .targetsize     = 0,
-       .table          = "raw",
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
-};
-
-static int __init init(void)
+static int __init xt_notrack_init(void)
 {
-       int ret;
-
-       ret = xt_register_target(&notrack_reg);
-       if (ret)
-               return ret;
-
-       ret = xt_register_target(&notrack6_reg);
-       if (ret)
-               xt_unregister_target(&notrack_reg);
-
-       return ret;
+       return xt_register_targets(xt_notrack_target,
+                                  ARRAY_SIZE(xt_notrack_target));
 }
 
-static void __exit fini(void)
+static void __exit xt_notrack_fini(void)
 {
-       xt_unregister_target(&notrack6_reg);
-       xt_unregister_target(&notrack_reg);
+       xt_unregister_targets(xt_notrack_target, ARRAY_SIZE(xt_notrack_target));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_notrack_init);
+module_exit(xt_notrack_fini);