Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2947cce2 authored by jianzhou's avatar jianzhou
Browse files

Merge android-4.9.184 (ab758e10) into msm-4.9 



* refs/heads/tmp-ab758e10:
  Linux 4.9.184
  tcp: refine memory limit test in tcp_fragment()

Change-Id: I1b4695447837e55072114f1bb91def8d4d665fe5
Signed-off-by: default avatarjianzhou <jianzhou@codeaurora.org>
parents 31d65a6a ab758e10

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 183

SUBLEVEL = 184

EXTRAVERSION =

NAME = Roaring Lionus

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1185,7 +1185,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, 
	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;

	}