Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / net / ipv6 / netfilter / ip6t_HL.c

diff --git a/net/ipv6/netfilter/ip6t_HL.c b/net/ipv6/netfilter/ip6t_HL.c
index 306200c3505788fd8675c5c4a8bdd839f0ff6cc0..ccbab66277e37d25918eea826c6a35059864a8f4 100644 (file)
--- a/net/ipv6/netfilter/ip6t_HL.c
+++ b/net/ipv6/netfilter/ip6t_HL.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Hop Limit modification target for ip6tables
  * Maciej Soltysiak <solt@dns.toxicfilms.tv>
  * Based on HW's TTL module
@@ -9,23 +9,24 @@
 #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, 
+static unsigned int ip6t_hl_target(struct sk_buff **pskb,
                                   const struct net_device *in,
                                   const struct net_device *out,
                                   unsigned int hooknum,
-                                  const void *targinfo, void *userinfo)
+                                  const struct xt_target *target,
+                                  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))
@@ -52,67 +53,51 @@ 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;
 
-       if (targinfosize != IP6T_ALIGN(sizeof(struct ip6t_HL_info))) {
-               printk(KERN_WARNING "ip6t_HL: targinfosize %u != %Zu\n",
-                               targinfosize,
-                               IP6T_ALIGN(sizeof(struct ip6t_HL_info)));
-               return 0;       
-       }       
-
-       if (strcmp(tablename, "mangle")) {
-               printk(KERN_WARNING "ip6t_HL: can only be called from "
-                       "\"mangle\" table, not \"%s\"\n", tablename);
-               return 0;
-       }
-
        if (info->mode > IP6T_HL_MAXMODE) {
-               printk(KERN_WARNING "ip6t_HL: invalid or unknown Mode %u\n", 
+               printk(KERN_WARNING "ip6t_HL: invalid or unknown Mode %u\n",
                        info->mode);
                return 0;
        }
-
        if ((info->mode != IP6T_HL_SET) && (info->hop_limit == 0)) {
                printk(KERN_WARNING "ip6t_HL: increment/decrement doesn't "
                        "make sense with value 0\n");
                return 0;
        }
-       
        return 1;
 }
 
-static struct ip6t_target ip6t_HL = { 
-       .name           = "HL", 
-       .target         = ip6t_hl_target, 
-       .checkentry     = ip6t_hl_checkentry, 
+static struct xt_target ip6t_HL = {
+       .name           = "HL",
+       .family         = AF_INET6,
+       .target         = ip6t_hl_target,
+       .targetsize     = sizeof(struct ip6t_HL_info),
+       .table          = "mangle",
+       .checkentry     = ip6t_hl_checkentry,
        .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);