From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 29 Jul 2014 05:55:15 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~81
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c18f677c1a7a94efc845ecedde2f1d1463d4359;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

7c18f677c1a7a94efc845ecedde2f1d1463d4359
diff --cc net/ipv4/tcp.c
index 59e8bbc04d95,5d4bd6ca3ab1..4619ae6c5d50
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -1242,10 -1238,8 +1242,11 @@@ wait_for_memory
  out:
  	if (copied)
  		tcp_push(sk, flags, mss_now, tp->nonagle);
+ out_nopush:
  	release_sock(sk);
 +
 +	if (copied + copied_syn)
 +		uid_stat_tcp_snd(current_uid(), copied + copied_syn);
  	return copied + copied_syn;
  
  do_fault: