aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/xt_CONNSECMARK.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@gmx.de>2007-02-07 15:06:43 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-08 12:39:11 -0800
commit2822b0d92675cd8d4fc73112334f4b113ba7c979 (patch)
treeb4167e7664415b8c9331479eb7c3d65c25821156 /net/netfilter/xt_CONNSECMARK.c
parent[NETFILTER]: tcp conntrack: do liberal tracking for picked up connections (diff)
downloadlinux-dev-2822b0d92675cd8d4fc73112334f4b113ba7c979.tar.xz
linux-dev-2822b0d92675cd8d4fc73112334f4b113ba7c979.zip
[NETFILTER]: Remove useless comparisons before assignments
Remove unnecessary if() constructs before assignment. Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_CONNSECMARK.c')
-rw-r--r--net/netfilter/xt_CONNSECMARK.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index a3fe3c334b09..1ab0db641f96 100644
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -41,8 +41,7 @@ static void secmark_save(struct sk_buff *skb)
connsecmark = nf_ct_get_secmark(skb, &ctinfo);
if (connsecmark && !*connsecmark)
- if (*connsecmark != skb->secmark)
- *connsecmark = skb->secmark;
+ *connsecmark = skb->secmark;
}
}
@@ -58,8 +57,7 @@ static void secmark_restore(struct sk_buff *skb)
connsecmark = nf_ct_get_secmark(skb, &ctinfo);
if (connsecmark && *connsecmark)
- if (skb->secmark != *connsecmark)
- skb->secmark = *connsecmark;
+ skb->secmark = *connsecmark;
}
}