diff options
| author |   Jan Engelhardt <jengelh@gmx.de> | 2007-02-07 15:06:43 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 12:39:11 -0800 |
| commit | 2822b0d92675cd8d4fc73112334f4b113ba7c979 (patch) | |
| tree | b4167e7664415b8c9331479eb7c3d65c25821156 /net/netfilter/xt_CONNMARK.c | |
| parent | [NETFILTER]: tcp conntrack: do liberal tracking for picked up connections (diff) | |
| download | linux-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_CONNMARK.c')
| -rw-r--r-- | net/netfilter/xt_CONNMARK.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c index 0534bfa65cce..795c058b16a5 100644 --- a/net/netfilter/xt_CONNMARK.c +++ b/net/netfilter/xt_CONNMARK.c @@ -61,7 +61,7 @@ target(struct sk_buff **pskb, #else nf_conntrack_event_cache(IPCT_MARK, *pskb); #endif - } + } break; case XT_CONNMARK_SAVE: newmark = (*ctmark & ~markinfo->mask) | @@ -78,8 +78,7 @@ target(struct sk_buff **pskb, case XT_CONNMARK_RESTORE: mark = (*pskb)->mark; diff = (*ctmark ^ mark) & markinfo->mask; - if (diff != 0) - (*pskb)->mark = mark ^ diff; + (*pskb)->mark = mark ^ diff; break; } } |