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

Commit cc8f9947 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a0b21f86 09a70683

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;

	}