[INET]: Consolidate xxx_frag_create()

[safe/jmp/linux-2.6] / net / ipv4 / netfilter / ipt_TTL.c

diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index f48892a..c620a05 100644 (file)
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -12,28 +12,27 @@
 #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 
-ipt_ttl_target(struct sk_buff **pskb,
+static unsigned int
+ipt_ttl_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)
 {
        struct iphdr *iph;
        const struct ipt_TTL_info *info = targinfo;
-       u_int16_t diffs[2];
        int new_ttl;
 
-       if (!skb_make_writable(pskb, (*pskb)->len))
+       if (!skb_make_writable(skb, skb->len))
                return NF_DROP;
 
-       iph = (*pskb)->nh.iph;
+       iph = ip_hdr(skb);
 
        switch (info->mode) {
                case IPT_TTL_SET:
@@ -55,53 +54,50 @@ ipt_ttl_target(struct sk_buff **pskb,
        }
 
        if (new_ttl != iph->ttl) {
-               diffs[0] = htons(((unsigned)iph->ttl) << 8) ^ 0xFFFF;
+               nf_csum_replace2(&iph->check, htons(iph->ttl << 8),
+                                             htons(new_ttl << 8));
                iph->ttl = new_ttl;
-               diffs[1] = htons(((unsigned)iph->ttl) << 8);
-               iph->check = csum_fold(csum_partial((char *)diffs,
-                                                   sizeof(diffs),
-                                                   iph->check^0xFFFF));
        }
 
-       return IPT_CONTINUE;
+       return XT_CONTINUE;
 }
 
-static int ipt_ttl_checkentry(const char *tablename,
+static bool ipt_ttl_checkentry(const char *tablename,
                const void *e,
                const struct xt_target *target,
                void *targinfo,
-               unsigned int targinfosize,
                unsigned int hook_mask)
 {
-       struct ipt_TTL_info *info = targinfo;
+       const 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;
+               return false;
        }
-       if ((info->mode != IPT_TTL_SET) && (info->ttl == 0))
-               return 0;
-       return 1;
+       if (info->mode != IPT_TTL_SET && info->ttl == 0)
+               return false;
+       return true;
 }
 
-static struct ipt_target ipt_TTL = { 
+static struct xt_target ipt_TTL __read_mostly = {
        .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);