diff options
| author | David S. Miller | 2009-12-03 22:23:12 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-03 22:23:12 +0100 |
| commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
| tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /net/ipv4/netfilter/ipt_ecn.c | |
| parent | bnx2: Update version to 2.0.3. (diff) | |
| parent | netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line (diff) | |
| download | kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.gz kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.xz kernel-qcow2-linux-424eff975192553a9ea8bfd51bf65039ffb356ef.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv4/netfilter/ipt_ecn.c')
| -rw-r--r-- | net/ipv4/netfilter/ipt_ecn.c | 4 |
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; |