[NETFILTER]: nfnetlink: remove unused includes in nfnetlink.c

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

diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 0a61272194677767828114d107f829a439adfc58..43817808d865daa2d85411c3df0a57710542f6f4 100644 (file)
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -27,14 +27,11 @@ target_v0(struct sk_buff **pskb,
          const struct net_device *out,
          unsigned int hooknum,
          const struct xt_target *target,
-         const void *targinfo,
-         void *userinfo)
+         const void *targinfo)
 {
        const struct xt_mark_target_info *markinfo = targinfo;
 
-       if((*pskb)->nfmark != markinfo->mark)
-               (*pskb)->nfmark = markinfo->mark;
-
+       (*pskb)->mark = markinfo->mark;
        return XT_CONTINUE;
 }
 
@@ -44,8 +41,7 @@ target_v1(struct sk_buff **pskb,
          const struct net_device *out,
          unsigned int hooknum,
          const struct xt_target *target,
-         const void *targinfo,
-         void *userinfo)
+         const void *targinfo)
 {
        const struct xt_mark_target_info_v1 *markinfo = targinfo;
        int mark = 0;
@@ -54,19 +50,17 @@ target_v1(struct sk_buff **pskb,
        case XT_MARK_SET:
                mark = markinfo->mark;
                break;
-               
+
        case XT_MARK_AND:
-               mark = (*pskb)->nfmark & markinfo->mark;
+               mark = (*pskb)->mark & markinfo->mark;
                break;
-               
+
        case XT_MARK_OR:
-               mark = (*pskb)->nfmark | markinfo->mark;
+               mark = (*pskb)->mark | markinfo->mark;
                break;
        }
 
-       if((*pskb)->nfmark != mark)
-               (*pskb)->nfmark = mark;
-
+       (*pskb)->mark = mark;
        return XT_CONTINUE;
 }
 
@@ -76,7 +70,6 @@ checkentry_v0(const char *tablename,
              const void *entry,
              const struct xt_target *target,
              void *targinfo,
-             unsigned int targinfosize,
              unsigned int hook_mask)
 {
        struct xt_mark_target_info *markinfo = targinfo;
@@ -93,7 +86,6 @@ checkentry_v1(const char *tablename,
              const void *entry,
              const struct xt_target *target,
              void *targinfo,
-             unsigned int targinfosize,
              unsigned int hook_mask)
 {
        struct xt_mark_target_info_v1 *markinfo = targinfo;
@@ -112,6 +104,35 @@ checkentry_v1(const char *tablename,
        return 1;
 }
 
+#ifdef CONFIG_COMPAT
+struct compat_xt_mark_target_info_v1 {
+       compat_ulong_t  mark;
+       u_int8_t        mode;
+       u_int8_t        __pad1;
+       u_int16_t       __pad2;
+};
+
+static void compat_from_user_v1(void *dst, void *src)
+{
+       struct compat_xt_mark_target_info_v1 *cm = src;
+       struct xt_mark_target_info_v1 m = {
+               .mark   = cm->mark,
+               .mode   = cm->mode,
+       };
+       memcpy(dst, &m, sizeof(m));
+}
+
+static int compat_to_user_v1(void __user *dst, void *src)
+{
+       struct xt_mark_target_info_v1 *m = src;
+       struct compat_xt_mark_target_info_v1 cm = {
+               .mark   = m->mark,
+               .mode   = m->mode,
+       };
+       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
+}
+#endif /* CONFIG_COMPAT */
+
 static struct xt_target xt_mark_target[] = {
        {
                .name           = "MARK",
@@ -130,6 +151,11 @@ static struct xt_target xt_mark_target[] = {
                .checkentry     = checkentry_v1,
                .target         = target_v1,
                .targetsize     = sizeof(struct xt_mark_target_info_v1),
+#ifdef CONFIG_COMPAT
+               .compatsize     = sizeof(struct compat_xt_mark_target_info_v1),
+               .compat_from_user = compat_from_user_v1,
+               .compat_to_user = compat_to_user_v1,
+#endif
                .table          = "mangle",
                .me             = THIS_MODULE,
        },