- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / net / netfilter / xt_CLASSIFY.c

diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index 77eeae6..77a52bf 100644 (file)
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -22,17 +22,14 @@
 
 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 *skb,
-       const struct net_device *in,
-       const struct net_device *out,
-       unsigned int hooknum,
-       const struct xt_target *target,
-       const void *targinfo)
+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;
 
@@ -40,42 +37,41 @@ target(struct sk_buff *skb,
        return XT_CONTINUE;
 }
 
-static struct xt_target xt_classify_target[] __read_mostly = {
+static struct xt_target classify_tg_reg[] __read_mostly = {
        {
                .family         = AF_INET,
                .name           = "CLASSIFY",
-               .target         = target,
+               .target         = classify_tg,
                .targetsize     = sizeof(struct xt_classify_target_info),
                .table          = "mangle",
-               .hooks          = (1 << NF_IP_LOCAL_OUT) |
-                                 (1 << NF_IP_FORWARD) |
-                                 (1 << NF_IP_POST_ROUTING),
+               .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,
+               .target         = classify_tg,
                .targetsize     = sizeof(struct xt_classify_target_info),
                .table          = "mangle",
-               .hooks          = (1 << NF_IP6_LOCAL_OUT) |
-                                 (1 << NF_IP6_FORWARD) |
-                                 (1 << NF_IP6_POST_ROUTING),
+               .hooks          = (1 << NF_INET_LOCAL_OUT) |
+                                 (1 << NF_INET_FORWARD) |
+                                 (1 << NF_INET_POST_ROUTING),
                .me             = THIS_MODULE,
        },
 };
 
-static int __init xt_classify_init(void)
+static int __init classify_tg_init(void)
 {
-       return xt_register_targets(xt_classify_target,
-                                  ARRAY_SIZE(xt_classify_target));
+       return xt_register_targets(classify_tg_reg,
+              ARRAY_SIZE(classify_tg_reg));
 }
 
-static void __exit xt_classify_fini(void)
+static void __exit classify_tg_exit(void)
 {
-       xt_unregister_targets(xt_classify_target,
-                             ARRAY_SIZE(xt_classify_target));
+       xt_unregister_targets(classify_tg_reg, ARRAY_SIZE(classify_tg_reg));
 }
 
-module_init(xt_classify_init);
-module_exit(xt_classify_fini);
+module_init(classify_tg_init);
+module_exit(classify_tg_exit);