diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-08 01:51:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-08 01:51:14 -0700 |
| commit | a19883a728162e7e4b66e2810d1892a84841f26c (patch) | |
| tree | 4c46051312898609c617b91a98155e4bf04503a0 /net/ipv4/tcp_output.c | |
| parent | 1c5947a789b459469485cfbb6f824c25a58f94e6 (diff) | |
| parent | 2958c456e6618d4c0572b0516c00c38a87564c37 (diff) | |
Merge "Merge android-4.4.184 (282d84a) into msm-4.4"
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; } |