diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 12:44:11 -0400 |
| commit | 77a50df2b14c8d3ee3c58c21c4a0e0157570df09 (patch) | |
| tree | 0e324a712e5e768c8353b0b5ba6ddc31095479f0 /net/ipv4/tcp_input.c | |
| parent | 96fffeb4b413a4f8f65bb627d59b7dfc97ea0b39 (diff) | |
| parent | 358c12953b88c5a06a57c33eb27c753b2e7934d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
iwlwifi: Allow building iwl3945 without iwl4965.
wireless: Fix compile error with wifi & leds
tcp: Fix slab corruption with ipv6 and tcp6fuzz
ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
[IPSEC]: Use digest_null directly for auth
sunrpc: fix missing kernel-doc
can: Fix copy_from_user() results interpretation
Revert "ipv6: Fix typo in net/ipv6/Kconfig"
tipc: endianness annotations
ipv6: result of csum_fold() is already 16bit, no need to cast
[XFRM] AUDIT: Fix flowlabel text format ambibuity.
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index ac9b8482f702..0298f80681f2 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -4925,8 +4925,7 @@ step5: | |||
| 4925 | tcp_data_snd_check(sk); | 4925 | tcp_data_snd_check(sk); |
| 4926 | tcp_ack_snd_check(sk); | 4926 | tcp_ack_snd_check(sk); |
| 4927 | 4927 | ||
| 4928 | if (tcp_defer_accept_check(sk)) | 4928 | tcp_defer_accept_check(sk); |
| 4929 | return -1; | ||
| 4930 | return 0; | 4929 | return 0; |
| 4931 | 4930 | ||
| 4932 | csum_error: | 4931 | csum_error: |