Merge 4.9.184 into android-4.9-q
Changes in 4.9.184
tcp: refine memory limit test in tcp_fragment()
Linux 4.9.184
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/Makefile b/Makefile
index 11844c8..04a4c33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 9
-SUBLEVEL = 183
+SUBLEVEL = 184
EXTRAVERSION =
NAME = Roaring Lionus
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index c1fd321..3f45981 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1185,7 +1185,7 @@
if (nsize < 0)
nsize = 0;
- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) {
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
return -ENOMEM;
}