diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-08-20 20:38:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-08-20 20:38:40 -0400 |
| commit | fd841326d73096ad79be9c3fa348f9ad04541cc2 (patch) | |
| tree | 59a340d83e8381a249e379b70a26729fb8482825 /net/ipv4 | |
| parent | a5ea169c9581553662bb79a1c8c98fed1ee84246 (diff) | |
[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/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/ipt_ECN.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c index ada9911118e9..d3250a3a5db4 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) | |||
| 61 | if (!tcph) | 61 | if (!tcph) |
| 62 | return 0; | 62 | return 0; |
| 63 | 63 | ||
| 64 | if (!(einfo->operation & IPT_ECN_OP_SET_ECE | 64 | if ((!(einfo->operation & IPT_ECN_OP_SET_ECE) || |
| 65 | || tcph->ece == einfo->proto.tcp.ece) | 65 | tcph->ece == einfo->proto.tcp.ece) && |
| 66 | && (!(einfo->operation & IPT_ECN_OP_SET_CWR | 66 | ((!(einfo->operation & IPT_ECN_OP_SET_CWR) || |
| 67 | || tcph->cwr == einfo->proto.tcp.cwr))) | 67 | tcph->cwr == einfo->proto.tcp.cwr))) |
| 68 | return 1; | 68 | return 1; |
| 69 | 69 | ||
| 70 | if (!skb_ip_make_writable(pskb, (*pskb)->nh.iph->ihl*4+sizeof(*tcph))) | 70 | if (!skb_ip_make_writable(pskb, (*pskb)->nh.iph->ihl*4+sizeof(*tcph))) |