aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-08-20 17:38:40 -0700
committerDavid S. Miller <davem@davemloft.net>2005-08-20 17:38:40 -0700
commitfd841326d73096ad79be9c3fa348f9ad04541cc2 (patch)
tree59a340d83e8381a249e379b70a26729fb8482825 /net
parenta5ea169c9581553662bb79a1c8c98fed1ee84246 (diff)
downloadkernel_samsung_tuna-fd841326d73096ad79be9c3fa348f9ad04541cc2.zip
kernel_samsung_tuna-fd841326d73096ad79be9c3fa348f9ad04541cc2.tar.gz
kernel_samsung_tuna-fd841326d73096ad79be9c3fa348f9ad04541cc2.tar.bz2
[NETFILTER]: Fix ECN target TCP marking
An incorrect check made it bail out before doing anything. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/ipt_ECN.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index ada9911..d3250a3 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -61,10 +61,10 @@ set_ect_tcp(struct sk_buff **pskb, const struct ipt_ECN_info *einfo, int inward)
if (!tcph)
return 0;
- if (!(einfo->operation & IPT_ECN_OP_SET_ECE
- || tcph->ece == einfo->proto.tcp.ece)
- && (!(einfo->operation & IPT_ECN_OP_SET_CWR
- || tcph->cwr == einfo->proto.tcp.cwr)))
+ if ((!(einfo->operation & IPT_ECN_OP_SET_ECE) ||
+ tcph->ece == einfo->proto.tcp.ece) &&
+ ((!(einfo->operation & IPT_ECN_OP_SET_CWR) ||
+ tcph->cwr == einfo->proto.tcp.cwr)))
return 1;
if (!skb_ip_make_writable(pskb, (*pskb)->nh.iph->ihl*4+sizeof(*tcph)))