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

Commit 2958c456 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.184 (282d84ad) into msm-4.4 



* refs/heads/tmp-282d84ad
  Linux 4.4.184
  tcp: refine memory limit test in tcp_fragment()

Change-Id: I99ffacfb623b2cc5acb0401a3dfc08bae6461810
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents bd48b0a1 282d84ad

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 183

SUBLEVEL = 184

EXTRAVERSION =

NAME = Blurry Fish Butt

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,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;

	}