Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / net / ipv4 / netfilter / ipt_TTL.c

diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index 96e79cc6d0f233dd20cb95b4ffc76336a72d2a7d..64be31c22ba9eb4aac423865fc640e835cca86fb 100644 (file)
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -12,14 +12,14 @@
 #include <linux/ip.h>
 #include <net/checksum.h>
 
-#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ipt_TTL.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
 MODULE_DESCRIPTION("IP tables TTL modification module");
 MODULE_LICENSE("GPL");
 
-static unsigned int 
+static unsigned int
 ipt_ttl_target(struct sk_buff **pskb,
               const struct net_device *in, const struct net_device *out,
               unsigned int hooknum, const struct xt_target *target,
@@ -54,13 +54,12 @@ ipt_ttl_target(struct sk_buff **pskb,
        }
 
        if (new_ttl != iph->ttl) {
-               iph->check = nf_csum_update(ntohs((iph->ttl << 8)) ^ 0xFFFF,
-                                           ntohs(new_ttl << 8),
-                                           iph->check);
+               nf_csum_replace2(&iph->check, htons(iph->ttl << 8),
+                                             htons(new_ttl << 8));
                iph->ttl = new_ttl;
        }
 
-       return IPT_CONTINUE;
+       return XT_CONTINUE;
 }
 
 static int ipt_ttl_checkentry(const char *tablename,
@@ -72,7 +71,7 @@ static int ipt_ttl_checkentry(const char *tablename,
        struct ipt_TTL_info *info = targinfo;
 
        if (info->mode > IPT_TTL_MAXMODE) {
-               printk(KERN_WARNING "ipt_TTL: invalid or unknown Mode %u\n", 
+               printk(KERN_WARNING "ipt_TTL: invalid or unknown Mode %u\n",
                        info->mode);
                return 0;
        }
@@ -81,23 +80,24 @@ static int ipt_ttl_checkentry(const char *tablename,
        return 1;
 }
 
-static struct ipt_target ipt_TTL = { 
+static struct xt_target ipt_TTL = {
        .name           = "TTL",
-       .target         = ipt_ttl_target, 
+       .family         = AF_INET,
+       .target         = ipt_ttl_target,
        .targetsize     = sizeof(struct ipt_TTL_info),
        .table          = "mangle",
-       .checkentry     = ipt_ttl_checkentry, 
+       .checkentry     = ipt_ttl_checkentry,
        .me             = THIS_MODULE,
 };
 
 static int __init ipt_ttl_init(void)
 {
-       return ipt_register_target(&ipt_TTL);
+       return xt_register_target(&ipt_TTL);
 }
 
 static void __exit ipt_ttl_fini(void)
 {
-       ipt_unregister_target(&ipt_TTL);
+       xt_unregister_target(&ipt_TTL);
 }
 
 module_init(ipt_ttl_init);