Merge branch 'bugzilla-12270' into release

[safe/jmp/linux-2.6] / net / netfilter / xt_NFQUEUE.c

diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index 2873e1c..f9977b3 100644 (file)
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -3,9 +3,9 @@
  * (C) 2005 by Harald Welte <laforge@netfilter.org>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as 
+ * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- * 
+ *
  */
 
 #include <linux/module.h>
@@ -17,78 +17,53 @@
 #include <linux/netfilter/xt_NFQUEUE.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
-MODULE_DESCRIPTION("[ip,ip6,arp]_tables NFQUEUE target");
+MODULE_DESCRIPTION("Xtables: packet forwarding to netlink");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_NFQUEUE");
 MODULE_ALIAS("ip6t_NFQUEUE");
 MODULE_ALIAS("arpt_NFQUEUE");
 
 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)
+nfqueue_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct xt_NFQ_info *tinfo = targinfo;
+       const struct xt_NFQ_info *tinfo = par->targinfo;
 
        return NF_QUEUE_NR(tinfo->queuenum);
 }
 
-static struct xt_target ipt_NFQ_reg = {
-       .name           = "NFQUEUE",
-       .target         = target,
-       .targetsize     = sizeof(struct xt_NFQ_info),
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_target ip6t_NFQ_reg = {
-       .name           = "NFQUEUE",
-       .target         = target,
-       .targetsize     = sizeof(struct xt_NFQ_info),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_target nfqueue_tg_reg[] __read_mostly = {
+       {
+               .name           = "NFQUEUE",
+               .family         = NFPROTO_IPV4,
+               .target         = nfqueue_tg,
+               .targetsize     = sizeof(struct xt_NFQ_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "NFQUEUE",
+               .family         = NFPROTO_IPV6,
+               .target         = nfqueue_tg,
+               .targetsize     = sizeof(struct xt_NFQ_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "NFQUEUE",
+               .family         = NFPROTO_ARP,
+               .target         = nfqueue_tg,
+               .targetsize     = sizeof(struct xt_NFQ_info),
+               .me             = THIS_MODULE,
+       },
 };
 
-static struct xt_target arpt_NFQ_reg = {
-       .name           = "NFQUEUE",
-       .target         = target,
-       .targetsize     = sizeof(struct xt_NFQ_info),
-       .family         = NF_ARP,
-       .me             = THIS_MODULE,
-};
-
-static int __init init(void)
+static int __init nfqueue_tg_init(void)
 {
-       int ret;
-       ret = xt_register_target(&ipt_NFQ_reg);
-       if (ret)
-               return ret;
-       ret = xt_register_target(&ip6t_NFQ_reg);
-       if (ret)
-               goto out_ip;
-       ret = xt_register_target(&arpt_NFQ_reg);
-       if (ret)
-               goto out_ip6;
-
-       return ret;
-out_ip6:
-       xt_unregister_target(&ip6t_NFQ_reg);
-out_ip:
-       xt_unregister_target(&ipt_NFQ_reg);
-
-       return ret;
+       return xt_register_targets(nfqueue_tg_reg, ARRAY_SIZE(nfqueue_tg_reg));
 }
 
-static void __exit fini(void)
+static void __exit nfqueue_tg_exit(void)
 {
-       xt_unregister_target(&arpt_NFQ_reg);
-       xt_unregister_target(&ip6t_NFQ_reg);
-       xt_unregister_target(&ipt_NFQ_reg);
+       xt_unregister_targets(nfqueue_tg_reg, ARRAY_SIZE(nfqueue_tg_reg));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(nfqueue_tg_init);
+module_exit(nfqueue_tg_exit);