Commit 3c47fb2f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'io_uring-zerocopy-send' of git://git.kernel.org/pub/scm/linux/kernel/git/kuba/linux 



Pull in Pavel's patch from a shared branch.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1b5995e3 2829a267

net/core/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk, 
{

	int frag;



	if (msg && msg->sg_from_iter)

	if (msg && msg->msg_ubuf && msg->sg_from_iter)

		return msg->sg_from_iter(sk, skb, from, length);



	frag = skb_shinfo(skb)->nr_frags;