[NETFILTER]: Replace sk_buff ** with sk_buff *

[mirror_ubuntu-artful-kernel.git] / net / netfilter / xt_MARK.c

diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 0b48547e8d64bb0a2e41998733713a1b51730196..bc6503d77d75437d051c863a3b7771da8948a943 100644 (file)
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -22,7 +22,7 @@ MODULE_ALIAS("ipt_MARK");
 MODULE_ALIAS("ip6t_MARK");
 
 static unsigned int
-target_v0(struct sk_buff **pskb,
+target_v0(struct sk_buff *skb,
          const struct net_device *in,
          const struct net_device *out,
          unsigned int hooknum,
@@ -31,14 +31,12 @@ target_v0(struct sk_buff **pskb,
 {
        const struct xt_mark_target_info *markinfo = targinfo;
 
-       if((*pskb)->mark != markinfo->mark)
-               (*pskb)->mark = markinfo->mark;
-
+       skb->mark = markinfo->mark;
        return XT_CONTINUE;
 }
 
 static unsigned int
-target_v1(struct sk_buff **pskb,
+target_v1(struct sk_buff *skb,
          const struct net_device *in,
          const struct net_device *out,
          unsigned int hooknum,
@@ -52,60 +50,58 @@ target_v1(struct sk_buff **pskb,
        case XT_MARK_SET:
                mark = markinfo->mark;
                break;
-               
+
        case XT_MARK_AND:
-               mark = (*pskb)->mark & markinfo->mark;
+               mark = skb->mark & markinfo->mark;
                break;
-               
+
        case XT_MARK_OR:
-               mark = (*pskb)->mark | markinfo->mark;
+               mark = skb->mark | markinfo->mark;
                break;
        }
 
-       if((*pskb)->mark != mark)
-               (*pskb)->mark = mark;
-
+       skb->mark = mark;
        return XT_CONTINUE;
 }
 
 
-static int
+static bool
 checkentry_v0(const char *tablename,
              const void *entry,
              const struct xt_target *target,
              void *targinfo,
              unsigned int hook_mask)
 {
-       struct xt_mark_target_info *markinfo = targinfo;
+       const struct xt_mark_target_info *markinfo = targinfo;
 
        if (markinfo->mark > 0xffffffff) {
                printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
-               return 0;
+               return false;
        }
-       return 1;
+       return true;
 }
 
-static int
+static bool
 checkentry_v1(const char *tablename,
              const void *entry,
              const struct xt_target *target,
              void *targinfo,
              unsigned int hook_mask)
 {
-       struct xt_mark_target_info_v1 *markinfo = targinfo;
+       const struct xt_mark_target_info_v1 *markinfo = targinfo;
 
        if (markinfo->mode != XT_MARK_SET
            && markinfo->mode != XT_MARK_AND
            && markinfo->mode != XT_MARK_OR) {
                printk(KERN_WARNING "MARK: unknown mode %u\n",
                       markinfo->mode);
-               return 0;
+               return false;
        }
        if (markinfo->mark > 0xffffffff) {
                printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
-               return 0;
+               return false;
        }
-       return 1;
+       return true;
 }
 
 #ifdef CONFIG_COMPAT
@@ -118,7 +114,7 @@ struct compat_xt_mark_target_info_v1 {
 
 static void compat_from_user_v1(void *dst, void *src)
 {
-       struct compat_xt_mark_target_info_v1 *cm = src;
+       const struct compat_xt_mark_target_info_v1 *cm = src;
        struct xt_mark_target_info_v1 m = {
                .mark   = cm->mark,
                .mode   = cm->mode,
@@ -128,7 +124,7 @@ static void compat_from_user_v1(void *dst, void *src)
 
 static int compat_to_user_v1(void __user *dst, void *src)
 {
-       struct xt_mark_target_info_v1 *m = src;
+       const struct xt_mark_target_info_v1 *m = src;
        struct compat_xt_mark_target_info_v1 cm = {
                .mark   = m->mark,
                .mode   = m->mode,
@@ -137,7 +133,7 @@ static int compat_to_user_v1(void __user *dst, void *src)
 }
 #endif /* CONFIG_COMPAT */
 
-static struct xt_target xt_mark_target[] = {
+static struct xt_target xt_mark_target[] __read_mostly = {
        {
                .name           = "MARK",
                .family         = AF_INET,