[INET]: Omit double hash calculations in xxx_frag_intern

[linux-2.6-omap-h63xx.git] / net / ipv4 / netfilter / ipt_TTL.c

diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index 64be31c22ba9eb4aac423865fc640e835cca86fb..c620a052766616349f561e119fe0087d41ea6607 100644 (file)
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -20,7 +20,7 @@ MODULE_DESCRIPTION("IP tables TTL modification module");
 MODULE_LICENSE("GPL");
 
 static unsigned int
-ipt_ttl_target(struct sk_buff **pskb,
+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)
@@ -29,10 +29,10 @@ ipt_ttl_target(struct sk_buff **pskb,
        const struct ipt_TTL_info *info = targinfo;
        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:
@@ -62,25 +62,25 @@ ipt_ttl_target(struct sk_buff **pskb,
        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",
                        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 xt_target ipt_TTL = {
+static struct xt_target ipt_TTL __read_mostly = {
        .name           = "TTL",
        .family         = AF_INET,
        .target         = ipt_ttl_target,