summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2021-07-27 16:42:14 +0300
committerVinod Koul <vkoul@kernel.org>2021-07-27 16:42:14 +0300
commitc28d5d5688c6278a1ad32670cbee35802a9e65c1 (patch)
tree9ee168f44d748f04d9fdbb490fbfabb55a39b708 /net/ipv4/tcp.c
parent0e96454ca26cc5c594ec792f7e5168cce726f7cf (diff)
parentfc7a6209d5710618eb4f72a77cd81b8d694ecf89 (diff)
downloadlinux-c28d5d5688c6278a1ad32670cbee35802a9e65c1.tar.xz
Merge tag 'bus_remove_return_void-5.15' into next
This helps to remove conflict on idxd driver Conflicts: drivers/dma/idxd/sysfs.c drivers/dma/idxd/bus.c Greg says: Bus: Make remove callback return void tag Tag for other trees/branches to pull from in order to have a stable place to build off of if they want to add new busses for 5.15. Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d5ab5f243640..8cb44040ec68 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1375,6 +1375,9 @@ new_segment:
}
pfrag->offset += copy;
} else {
+ if (!sk_wmem_schedule(sk, copy))
+ goto wait_for_space;
+
err = skb_zerocopy_iter_stream(sk, skb, msg, copy, uarg);
if (err == -EMSGSIZE || err == -EEXIST) {
tcp_mark_push(tp, skb);