diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-19 07:48:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-19 07:48:04 -0700 |
| commit | 1f0772fe27aa03764478bd9d3a4cbad417a854cc (patch) | |
| tree | a67c60edbcbb33a7e0706299dbaabf53e66bd193 /net/ipv4/tcp_input.c | |
| parent | 6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389 (diff) | |
| parent | f779b2d60ab95c17f1e025778ed0df3ec2f05d75 (diff) | |
Merge git://github.com/davem330/net
* git://github.com/davem330/net:
tcp: fix validation of D-SACK
tcp: fix build error if !CONFIG_SYN_COOKIES
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index ea0d2183df4b..21fab3edb92c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1124,7 +1124,7 @@ static int tcp_is_sackblock_valid(struct tcp_sock *tp, int is_dsack, return 0; /* ...Then it's D-SACK, and must reside below snd_una completely */ - if (!after(end_seq, tp->snd_una)) + if (after(end_seq, tp->snd_una)) return 0; if (!before(start_seq, tp->undo_marker)) |