diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-20 21:53:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-20 21:53:04 -0400 |
| commit | 17eea0df5f7068fc04959e655ef8f0a0ed097e19 (patch) | |
| tree | d44b5cceb813dddfd1e62fe9f92556cf113d62fd /net/ipv4 | |
| parent | 9b905fe68433378032b851c4d81a59187689fa52 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e13546ca9923..bb485fcb077e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -917,8 +917,7 @@ new_segment: | |||
| 917 | wait_for_sndbuf: | 917 | wait_for_sndbuf: |
| 918 | set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); | 918 | set_bit(SOCK_NOSPACE, &sk->sk_socket->flags); |
| 919 | wait_for_memory: | 919 | wait_for_memory: |
| 920 | if (copied) | 920 | tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH); |
| 921 | tcp_push(sk, flags & ~MSG_MORE, mss_now, TCP_NAGLE_PUSH); | ||
| 922 | 921 | ||
| 923 | if ((err = sk_stream_wait_memory(sk, &timeo)) != 0) | 922 | if ((err = sk_stream_wait_memory(sk, &timeo)) != 0) |
| 924 | goto do_error; | 923 | goto do_error; |