[NETFILTER]: Remove redundant parentheses/braces

[mirror_ubuntu-bionic-kernel.git] / net / ipv4 / netfilter / ipt_TTL.c

diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index fffe5ca82e915d472c2a4d63c32192b1d968b546..737830b68adeb92c7e53039f1c3a2b37c43b9588 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,
@@ -32,7 +32,7 @@ ipt_ttl_target(struct sk_buff **pskb,
        if (!skb_make_writable(pskb, (*pskb)->len))
                return NF_DROP;
 
-       iph = (*pskb)->nh.iph;
+       iph = ip_hdr(*pskb);
 
        switch (info->mode) {
                case IPT_TTL_SET:
@@ -59,44 +59,45 @@ ipt_ttl_target(struct sk_buff **pskb,
                iph->ttl = new_ttl;
        }
 
-       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 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 = {
        .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);