123456789101112131415161718192021222324252627282930313233343536373839 |
- From: Gerardo Esteban Malazdrewicz <gerardo@malazdrewicz.com.ar>
- Date: Fri, 29 Dec 2017 23:44:24 -0400
- Subject: linux414
- Origin: https://bugs.debian.org/885885
- linux 4.14 changed the kernel_read function prototype.
- ---
- src/shared/linux_osl.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
- diff -Nurp broadcom-wl-6.30.223.271.orig/src/shared/linux_osl.c broadcom-wl-6.30.223.271/src/shared/linux_osl.c
- --- broadcom-wl-6.30.223.271.orig/src/shared/linux_osl.c 2020-01-11 01:17:02.688960782 +0200
- +++ broadcom-wl-6.30.223.271/src/shared/linux_osl.c 2020-01-11 01:37:41.527449819 +0200
- @@ -1076,11 +1076,21 @@ osl_os_get_image_block(char *buf, int le
- {
- struct file *fp = (struct file *)image;
- int rdlen;
- + loff_t pos;
-
- if (!image)
- return 0;
-
- - rdlen = kernel_read(fp, fp->f_pos, buf, len);
- + pos = fp->f_pos;
- + rdlen = kernel_read(fp,
- +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- + pos,
- +#endif
- + buf, len
- +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
- + ,&pos
- +#endif
- + );
- if (rdlen > 0)
- fp->f_pos += rdlen;
-
|