summaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter/ipt_ecn.c
diff options
context:
space:
mode:
authorJoe Perches2009-11-23 23:17:06 +0100
committerPatrick McHardy2009-11-23 23:17:06 +0100
commit3666ed1c4837fd6906da0224c5373d7a2186a193 (patch)
tree4f8c035731606e28536d83dc8b8e871d9cc39090 /net/ipv4/netfilter/ipt_ecn.c
parentnetfilter: xtables: fix conntrack match v1 ipt-save output (diff)
downloadkernel-qcow2-linux-3666ed1c4837fd6906da0224c5373d7a2186a193.tar.gz
kernel-qcow2-linux-3666ed1c4837fd6906da0224c5373d7a2186a193.tar.xz
kernel-qcow2-linux-3666ed1c4837fd6906da0224c5373d7a2186a193.zip
netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line
Compile tested only. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4/netfilter/ipt_ecn.c')
-rw-r--r--net/ipv4/netfilter/ipt_ecn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ipt_ecn.c b/net/ipv4/netfilter/ipt_ecn.c
index 6289b64144c6..2a1e56b71908 100644
--- a/net/ipv4/netfilter/ipt_ecn.c
+++ b/net/ipv4/netfilter/ipt_ecn.c
@@ -96,8 +96,8 @@ static bool ecn_mt_check(const struct xt_mtchk_param *par)
if (info->invert & IPT_ECN_OP_MATCH_MASK)
return false;
- if (info->operation & (IPT_ECN_OP_MATCH_ECE|IPT_ECN_OP_MATCH_CWR)
- && ip->proto != IPPROTO_TCP) {
+ if (info->operation & (IPT_ECN_OP_MATCH_ECE|IPT_ECN_OP_MATCH_CWR) &&
+ ip->proto != IPPROTO_TCP) {
printk(KERN_WARNING "ipt_ecn: can't match TCP bits in rule for"
" non-tcp packets\n");
return false;