diff options
author | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:36:56 -0700 |
---|---|---|
committer | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:36:56 -0700 |
commit | 5c15664a86e18352ccdc2f501907725caa9ab73d (patch) | |
tree | f8289ea774881961a44d904a3f41f4c17b8facf3 /net/ipv4/tcp.c | |
parent | 80b8354d535d2e8d6ced0b0e129257dba1fb2130 (diff) | |
parent | f1c84a5cb52ee2915457b481c756fcc1dfe6a471 (diff) | |
download | kernel_samsung_tuna-5c15664a86e18352ccdc2f501907725caa9ab73d.zip kernel_samsung_tuna-5c15664a86e18352ccdc2f501907725caa9ab73d.tar.gz kernel_samsung_tuna-5c15664a86e18352ccdc2f501907725caa9ab73d.tar.bz2 |
Merge commit 'v3.0.30' into android-3.0
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; |