summaryrefslogtreecommitdiff
path: root/patches/0050-iov_iter/bluetooth.patch
diff options
context:
space:
mode:
authorDominik Sliwa <dominik.sliwa@toradex.com>2019-02-21 11:35:20 +0100
committerDominik Sliwa <dominik.sliwa@toradex.com>2019-02-21 14:07:51 +0100
commit36735bb86a5e144603743bb800d7f69362d2ee2d (patch)
tree363158c7f80f3fc5a7690ca9d9ff6e5fcd7fa52e /patches/0050-iov_iter/bluetooth.patch
parente7720369ef69376d1244b49373e34663eaa6b5a1 (diff)
backports: reintroduce bluetooth support
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'patches/0050-iov_iter/bluetooth.patch')
-rw-r--r--patches/0050-iov_iter/bluetooth.patch6
1 files changed, 3 insertions, 3 deletions
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))