netfilter: x_tables: use NFPROTO_* in extensions

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

diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 6b36e84..9d68da1 100644 (file)
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -15,70 +15,63 @@
 #include <linux/ip.h>
 #include <net/checksum.h>
 
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv6.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_CLASSIFY.h>
 
 MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("iptables qdisc classification target module");
+MODULE_DESCRIPTION("Xtables: Qdisc classification");
 MODULE_ALIAS("ipt_CLASSIFY");
+MODULE_ALIAS("ip6t_CLASSIFY");
 
 static unsigned int
-target(struct sk_buff **pskb,
-       const struct net_device *in,
-       const struct net_device *out,
-       unsigned int hooknum,
-       const void *targinfo,
-       void *userinfo)
+classify_tg(struct sk_buff *skb, const struct net_device *in,
+            const struct net_device *out, unsigned int hooknum,
+            const struct xt_target *target, const void *targinfo)
 {
        const struct xt_classify_target_info *clinfo = targinfo;
 
-       if ((*pskb)->priority != clinfo->priority)
-               (*pskb)->priority = clinfo->priority;
-
+       skb->priority = clinfo->priority;
        return XT_CONTINUE;
 }
 
-static struct xt_target classify_reg = { 
-       .name           = "CLASSIFY", 
-       .target         = target,
-       .targetsize     = sizeof(struct xt_classify_target_info),
-       .table          = "mangle",
-       .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
-                         (1 << NF_IP_POST_ROUTING),
-       .me             = THIS_MODULE,
-};
-static struct xt_target classify6_reg = { 
-       .name           = "CLASSIFY", 
-       .target         = target,
-       .targetsize     = sizeof(struct xt_classify_target_info),
-       .table          = "mangle",
-       .hooks          = (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_FORWARD) |
-                         (1 << NF_IP_POST_ROUTING),
-       .me             = THIS_MODULE,
+static struct xt_target classify_tg_reg[] __read_mostly = {
+       {
+               .family         = NFPROTO_IPV4,
+               .name           = "CLASSIFY",
+               .target         = classify_tg,
+               .targetsize     = sizeof(struct xt_classify_target_info),
+               .table          = "mangle",
+               .hooks          = (1 << NF_INET_LOCAL_OUT) |
+                                 (1 << NF_INET_FORWARD) |
+                                 (1 << NF_INET_POST_ROUTING),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "CLASSIFY",
+               .family         = NFPROTO_IPV6,
+               .target         = classify_tg,
+               .targetsize     = sizeof(struct xt_classify_target_info),
+               .table          = "mangle",
+               .hooks          = (1 << NF_INET_LOCAL_OUT) |
+                                 (1 << NF_INET_FORWARD) |
+                                 (1 << NF_INET_POST_ROUTING),
+               .me             = THIS_MODULE,
+       },
 };
 
-
-static int __init init(void)
+static int __init classify_tg_init(void)
 {
-       int ret;
-
-       ret = xt_register_target(AF_INET, &classify_reg);
-       if (ret)
-               return ret;
-
-       ret = xt_register_target(AF_INET6, &classify6_reg);
-       if (ret)
-               xt_unregister_target(AF_INET, &classify_reg);
-
-       return ret;
+       return xt_register_targets(classify_tg_reg,
+              ARRAY_SIZE(classify_tg_reg));
 }
 
-static void __exit fini(void)
+static void __exit classify_tg_exit(void)
 {
-       xt_unregister_target(AF_INET, &classify_reg);
-       xt_unregister_target(AF_INET6, &classify6_reg);
+       xt_unregister_targets(classify_tg_reg, ARRAY_SIZE(classify_tg_reg));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(classify_tg_init);
+module_exit(classify_tg_exit);