wok-current diff broadcom-wl64/stuff/014-linux414.patch @ rev 25643

Update broadcom-wl driver for kernel 4.x
author Stanislas Leduc <shann@slitaz.org>
date Fri Jan 19 12:44:23 2024 +0000 (8 months ago)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/broadcom-wl64/stuff/014-linux414.patch	Fri Jan 19 12:44:23 2024 +0000
     1.3 @@ -0,0 +1,37 @@
     1.4 +From: Gerardo Esteban Malazdrewicz <gerardo@malazdrewicz.com.ar>
     1.5 +Date: Fri, 29 Dec 2017 23:44:24 -0400
     1.6 +Subject: linux414
     1.7 +Origin: https://bugs.debian.org/885885
     1.8 +
     1.9 +linux 4.14 changed the kernel_read function prototype.
    1.10 +---
    1.11 + src/shared/linux_osl.c | 12 +++++++++++-
    1.12 + 1 files changed, 12 insertions(+), 1 deletion(-)
    1.13 +
    1.14 +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
    1.15 +index 9adc392..b24a973 100644
    1.16 +--- a/src/shared/linux_osl.c
    1.17 ++++ b/src/shared/linux_osl.c
    1.18 +@@ -1076,11 +1076,21 @@ osl_os_get_image_block(char *buf, int len, void *image)
    1.19 + {
    1.20 + 	struct file *fp = (struct file *)image;
    1.21 + 	int rdlen;
    1.22 ++	loff_t pos;
    1.23 + 
    1.24 + 	if (!image)
    1.25 + 		return 0;
    1.26 + 
    1.27 +-	rdlen = kernel_read(fp, fp->f_pos, buf, len);
    1.28 ++	pos = fp->f_pos;
    1.29 ++	rdlen = kernel_read(fp,
    1.30 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
    1.31 ++			pos,
    1.32 ++#endif
    1.33 ++			buf, len
    1.34 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
    1.35 ++			,&pos
    1.36 ++#endif
    1.37 ++	);
    1.38 + 	if (rdlen > 0)
    1.39 + 		fp->f_pos += rdlen;
    1.40 +