From 36735bb86a5e144603743bb800d7f69362d2ee2d Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Thu, 21 Feb 2019 11:35:20 +0100 Subject: backports: reintroduce bluetooth support Signed-off-by: Dominik Sliwa --- patches/0050-iov_iter/bluetooth.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/0050-iov_iter/bluetooth.patch') diff --git a/patches/0050-iov_iter/bluetooth.patch b/patches/0050-iov_iter/bluetooth.patch index 87506ff1..453723a0 100644 --- a/patches/0050-iov_iter/bluetooth.patch +++ b/patches/0050-iov_iter/bluetooth.patch @@ -110,7 +110,7 @@ int sent = 0; +#if LINUX_VERSION_IS_GEQ(3,19,0) - if (copy_from_iter(skb_put(skb, count), count, &msg->msg_iter) != count) + if (!copy_from_iter_full(skb_put(skb, count), count, &msg->msg_iter)) +#else + if (chan->ops->memcpy_fromiovec(chan, skb_put(skb, count), + msg->msg_iov, count)) @@ -123,8 +123,8 @@ *frag = tmp; +#if LINUX_VERSION_IS_GEQ(3,19,0) - if (copy_from_iter(skb_put(*frag, count), count, - &msg->msg_iter) != count) + if (!copy_from_iter_full(skb_put(*frag, count), count, + &msg->msg_iter)) +#else + if (chan->ops->memcpy_fromiovec(chan, skb_put(*frag, count), + msg->msg_iov, count)) -- cgit v1.2.3