diff options
| author | Srinivasarao P <spathi@codeaurora.org> | 2019-07-01 10:43:47 +0530 |
|---|---|---|
| committer | Srinivasarao P <spathi@codeaurora.org> | 2019-07-01 10:48:12 +0530 |
| commit | 2958c456e6618d4c0572b0516c00c38a87564c37 (patch) | |
| tree | 249d1329d82a1a0f0ea00b1df7e9d7b36b5fb4df /net/ipv4/tcp_output.c | |
| parent | bd48b0a101e8b4979a246f7d9c3e71a3f3175b86 (diff) | |
| parent | 282d84add5d7d1d9e937c76c0e90efd8490a11d6 (diff) | |
Merge android-4.4.184 (282d84a) into msm-4.4
* refs/heads/tmp-282d84a
Linux 4.4.184
tcp: refine memory limit test in tcp_fragment()
Change-Id: I99ffacfb623b2cc5acb0401a3dfc08bae6461810
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 6f7303d51274..c4f790251a7b 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -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; } |