diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-05-07 22:31:04 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-05-07 22:31:04 +0200 |
| commit | a48c18e8b30a8ec31acb09d45741fd99dd5baf06 (patch) | |
| tree | 89f9a9a2dbb5098cebfe31d772fc5cc5efc382d7 /net/ipv4/tcp.c | |
| parent | 3e4c7a42c8f3e1c1eabc85544ddaa1cf3da79271 (diff) | |
| parent | bea37381fd9a34c6660e5195d31beea86aa3dda3 (diff) | |
| download | kernel_samsung_crespo-a48c18e8b30a8ec31acb09d45741fd99dd5baf06.zip kernel_samsung_crespo-a48c18e8b30a8ec31acb09d45741fd99dd5baf06.tar.gz kernel_samsung_crespo-a48c18e8b30a8ec31acb09d45741fd99dd5baf06.tar.bz2 | |
Merge branch 'linux-3.0.y' into HEAD
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 09ced58..b0e5330 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -864,7 +864,7 @@ wait_for_memory: } out: - if (copied) + if (copied && !(flags & MSG_SENDPAGE_NOTLAST)) tcp_push(sk, flags, mss_now, tp->nonagle); return copied; |