diff options
| author | David S. Miller | 2011-03-02 20:30:24 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-03-02 20:30:24 +0100 |
| commit | 3872b284087081ee5cb0e4630954c2f7a2153cf5 (patch) | |
| tree | ead36598e35730e419edcf42dc788290af9e3d5b /net/netfilter/nf_conntrack_proto_tcp.c | |
| parent | inet: Replace left-over references to inet->cork (diff) | |
| parent | netfilter: nf_ct_tcp: fix out of sync scenario while in SYN_RECV (diff) | |
| download | kernel-qcow2-linux-3872b284087081ee5cb0e4630954c2f7a2153cf5.tar.gz kernel-qcow2-linux-3872b284087081ee5cb0e4630954c2f7a2153cf5.tar.xz kernel-qcow2-linux-3872b284087081ee5cb0e4630954c2f7a2153cf5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_tcp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 6f38d0e2ea4a..37bf94394be0 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -227,11 +227,11 @@ static const u8 tcp_conntracks[2][6][TCP_CONNTRACK_MAX] = { * sCL -> sIV */ /* sNO, sSS, sSR, sES, sFW, sCW, sLA, sTW, sCL, sS2 */ -/*synack*/ { sIV, sSR, sSR, sIG, sIG, sIG, sIG, sIG, sIG, sSR }, +/*synack*/ { sIV, sSR, sIG, sIG, sIG, sIG, sIG, sIG, sIG, sSR }, /* * sSS -> sSR Standard open. * sS2 -> sSR Simultaneous open - * sSR -> sSR Retransmitted SYN/ACK. + * sSR -> sIG Retransmitted SYN/ACK, ignore it. * sES -> sIG Late retransmitted SYN/ACK? * sFW -> sIG Might be SYN/ACK answering ignored SYN * sCW -> sIG |