diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
| commit | 995a0605a6665858d73f9e80053414909be33f27 (patch) | |
| tree | fcc66a6a77acdaae492f77c0c58c0233db74a2b4 /net/ipv4/tcp_input.c | |
| parent | a32750c2ca6f697903b19063fc86f4272865e3a1 (diff) | |
| parent | 677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0 (diff) | |
Merge branch 'at91/trng' into next/driver
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, | |||
| 1124 | return 0; | 1124 | return 0; |
| 1125 | 1125 | ||
| 1126 | /* ...Then it's D-SACK, and must reside below snd_una completely */ | 1126 | /* ...Then it's D-SACK, and must reside below snd_una completely */ |
| 1127 | if (!after(end_seq, tp->snd_una)) | 1127 | if (after(end_seq, tp->snd_una)) |
| 1128 | return 0; | 1128 | return 0; |
| 1129 | 1129 | ||
| 1130 | if (!before(start_seq, tp->undo_marker)) | 1130 | if (!before(start_seq, tp->undo_marker)) |