diff options
author | Johannes Berg <johannes.berg@intel.com> | 2017-02-07 23:04:11 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2017-02-09 14:52:26 +0100 |
commit | e13e44d9a81da4bf77d9869db5b4764fc0811d9f (patch) | |
tree | c610ae2b0f634df75fe88f65a047e5c741c9b0af /patches/0047-write_iter/bluetooth.patch | |
parent | 46939c43903da6b202c95a0fcb24acce55fd63c0 (diff) |
backports: always use new version compare macros
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0047-write_iter/bluetooth.patch')
-rw-r--r-- | patches/0047-write_iter/bluetooth.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/0047-write_iter/bluetooth.patch b/patches/0047-write_iter/bluetooth.patch index aa888d70..093b526c 100644 --- a/patches/0047-write_iter/bluetooth.patch +++ b/patches/0047-write_iter/bluetooth.patch @@ -4,7 +4,7 @@ return 0; } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++#if LINUX_VERSION_IS_GEQ(3,18,0) static inline ssize_t vhci_get_user(struct vhci_data *data, struct iov_iter *from) { @@ -30,7 +30,7 @@ if (!skb) return -ENOMEM; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++#if LINUX_VERSION_IS_GEQ(3,18,0) if (copy_from_iter(skb_put(skb, len), len, from) != len) { kfree_skb(skb); return -EFAULT; @@ -51,7 +51,7 @@ return ret; } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++#if LINUX_VERSION_IS_GEQ(3,18,0) static ssize_t vhci_write(struct kiocb *iocb, struct iov_iter *from) +#else +static ssize_t vhci_write(struct kiocb *iocb, const struct iovec *iov, @@ -61,7 +61,7 @@ struct file *file = iocb->ki_filp; struct vhci_data *data = file->private_data; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++#if LINUX_VERSION_IS_GEQ(3,18,0) return vhci_get_user(data, from); +#else + return vhci_get_user(data, iov, count); @@ -73,7 +73,7 @@ static const struct file_operations vhci_fops = { .owner = THIS_MODULE, .read = vhci_read, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++#if LINUX_VERSION_IS_GEQ(3,18,0) .write_iter = vhci_write, +#else + .aio_write = vhci_write, |