sys-kernel/bcmwl-dkms : revision bump

4 files changed, 32 insertions, 2 deletions

diff --git a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271 b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1
index 14762382..b0dda2f0 100644
--- a/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271
+++ b/metadata/md5-cache/sys-kernel/bcmwl-dkms-6.30.223.271-r1
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ae3790894787fb92892dd3d2e4f9e392
+_md5_=32d044b2d100c235ef9525d6381f50e0
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 61405378..3ad341b5 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -55,7 +55,7 @@ sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
 sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
 sys-fs/zfs 2.1.5: ZFS meta-package (Gentoo compatibility ebuild)
 sys-fs/zfs-utils 2.1.5: Userland utilities for ZFS Linux kernel module
-sys-kernel/bcmwl-dkms 6.30.223.271: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
+sys-kernel/bcmwl-dkms 6.30.223.271-r1: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r2: Dynamic Kernel Module Support
 sys-kernel/dracut 056-r10: Generic initramfs generation tool
 sys-kernel/linux-headers 5.19: Linux system headers
diff --git a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild
index 32204783..ea214e29 100644
--- a/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271.ebuild
+++ b/sys-kernel/bcmwl-dkms/bcmwl-dkms-6.30.223.271-r1.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/date-time.patch
 	"${FILESDIR}"/date-time-error.patch
 	"${FILESDIR}"/kernel-4.7-to-kernel-5.10.patch
+	"${FILESDIR}"/kernel-5.17.patch
 	"${FILESDIR}"/kernel-5.18.patch
 	"${FILESDIR}"/kernel-6.0.patch
 )
diff --git a/sys-kernel/bcmwl-dkms/files/kernel-5.17.patch b/sys-kernel/bcmwl-dkms/files/kernel-5.17.patch
new file mode 100644
index 00000000..9352b3ac
--- /dev/null
+++ b/sys-kernel/bcmwl-dkms/files/kernel-5.17.patch
@@ -0,0 +1,29 @@
+diff -Nur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c	2022-10-13 22:44:30.922488855 +0100
++++ b/src/wl/sys/wl_linux.c	2022-10-13 22:48:36.115511672 +0100
+@@ -3307,8 +3307,12 @@
+ static ssize_t
+ wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
++	wl_info_t * wl = pde_data(file_inode(filp));
++#else
+ 	wl_info_t * wl = PDE_DATA(file_inode(filp));
+ #endif
++#endif
+ 	int bcmerror, len;
+ 	int to_user = 0;
+ 	char tmp[8];
+@@ -3364,8 +3368,12 @@
+ static ssize_t
+ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0)
++	wl_info_t * wl = pde_data(file_inode(filp));
++#else
+ 	wl_info_t * wl = PDE_DATA(file_inode(filp));
+ #endif
++#endif
+ 	int from_user = 0;
+ 	int bcmerror;
+