[NETFILTER]: Introduce NF_INET_ hook values

[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 3cd2ac9..e4f7f86 100644 (file)
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -15,6 +15,8 @@
 #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>
 
@@ -22,66 +24,58 @@ MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("iptables qdisc classification target module");
 MODULE_ALIAS("ipt_CLASSIFY");
+MODULE_ALIAS("ip6t_CLASSIFY");
 
 static unsigned int
-target(struct sk_buff **pskb,
+target(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,
-       void *userinfo)
+       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),
-       .family         = AF_INET,
-       .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),
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+static struct xt_target xt_classify_target[] __read_mostly = {
+       {
+               .family         = AF_INET,
+               .name           = "CLASSIFY",
+               .target         = target,
+               .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         = AF_INET6,
+               .target         = target,
+               .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 xt_classify_init(void)
 {
-       int ret;
-
-       ret = xt_register_target(&classify_reg);
-       if (ret)
-               return ret;
-
-       ret = xt_register_target(&classify6_reg);
-       if (ret)
-               xt_unregister_target(&classify_reg);
-
-       return ret;
+       return xt_register_targets(xt_classify_target,
+                                  ARRAY_SIZE(xt_classify_target));
 }
 
-static void __exit fini(void)
+static void __exit xt_classify_fini(void)
 {
-       xt_unregister_target(&classify_reg);
-       xt_unregister_target(&classify6_reg);
+       xt_unregister_targets(xt_classify_target,
+                             ARRAY_SIZE(xt_classify_target));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_classify_init);
+module_exit(xt_classify_fini);