Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / net / ipv6 / netfilter / ip6t_HL.c

diff --git a/net/ipv6/netfilter/ip6t_HL.c b/net/ipv6/netfilter/ip6t_HL.c
index da14c6d86bcc63651403e21120e3fce6e50fcf06..04e500172fb48abc3c4505c9e8e4ec605338c4ba 100644 (file)
--- a/net/ipv6/netfilter/ip6t_HL.c
+++ b/net/ipv6/netfilter/ip6t_HL.c
@@ -9,12 +9,13 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/ip.h>
+#include <linux/ipv6.h>
 
-#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv6/ip6t_HL.h>
 
 MODULE_AUTHOR("Maciej Soltysiak <solt@dns.toxicfilms.tv>");
-MODULE_DESCRIPTION("IP tables Hop Limit modification module");
+MODULE_DESCRIPTION("IP6 tables Hop Limit modification module");
 MODULE_LICENSE("GPL");
 
 static unsigned int ip6t_hl_target(struct sk_buff **pskb, 
@@ -22,11 +23,10 @@ static unsigned int ip6t_hl_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)
 {
        struct ipv6hdr *ip6h;
        const struct ip6t_HL_info *info = targinfo;
-       u_int16_t diffs[2];
        int new_hl;
 
        if (!skb_make_writable(pskb, (*pskb)->len))
@@ -53,20 +53,15 @@ static unsigned int ip6t_hl_target(struct sk_buff **pskb,
                        break;
        }
 
-       if (new_hl != ip6h->hop_limit) {
-               diffs[0] = htons(((unsigned)ip6h->hop_limit) << 8) ^ 0xFFFF;
-               ip6h->hop_limit = new_hl;
-               diffs[1] = htons(((unsigned)ip6h->hop_limit) << 8);
-       }
+       ip6h->hop_limit = new_hl;
 
-       return IP6T_CONTINUE;
+       return XT_CONTINUE;
 }
 
 static int ip6t_hl_checkentry(const char *tablename,
                const void *entry,
                const struct xt_target *target,
                void *targinfo,
-               unsigned int targinfosize,
                unsigned int hook_mask)
 {
        struct ip6t_HL_info *info = targinfo;
@@ -84,8 +79,9 @@ static int ip6t_hl_checkentry(const char *tablename,
        return 1;
 }
 
-static struct ip6t_target ip6t_HL = { 
+static struct xt_target ip6t_HL = {
        .name           = "HL", 
+       .family         = AF_INET6,
        .target         = ip6t_hl_target, 
        .targetsize     = sizeof(struct ip6t_HL_info),
        .table          = "mangle",
@@ -93,15 +89,15 @@ static struct ip6t_target ip6t_HL = {
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init ip6t_hl_init(void)
 {
-       return ip6t_register_target(&ip6t_HL);
+       return xt_register_target(&ip6t_HL);
 }
 
-static void __exit fini(void)
+static void __exit ip6t_hl_fini(void)
 {
-       ip6t_unregister_target(&ip6t_HL);
+       xt_unregister_target(&ip6t_HL);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ip6t_hl_init);
+module_exit(ip6t_hl_fini);