[NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access

[deliverable/linux.git] / net / netfilter / xt_SECMARK.c

diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
index add752196290d8c44cce0a54f4fa9de0eccff8c1..705f0e830a79576d73529964523eb40bfc7f1c68 100644 (file)
--- a/net/netfilter/xt_SECMARK.c
+++ b/net/netfilter/xt_SECMARK.c
@@ -47,9 +47,7 @@ static unsigned int target(struct sk_buff **pskb, const struct net_device *in,
                BUG();
        }
 
-       if ((*pskb)->secmark != secmark)
-               (*pskb)->secmark = secmark;
-
+       (*pskb)->secmark = secmark;
        return XT_CONTINUE;
 }
 
@@ -57,7 +55,7 @@ static int checkentry_selinux(struct xt_secmark_target_info *info)
 {
        int err;
        struct xt_secmark_target_selinux_info *sel = &info->u.sel;
-       
+
        sel->selctx[SECMARK_SELCTX_MAX - 1] = '\0';
 
        err = selinux_string_to_sid(sel->selctx, &sel->selsid);