sys-kernel/broadcom-sta-dkms : revision bump

4 files changed, 33 insertions, 2 deletions

diff --git a/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r6 b/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r7
index 723040fb..b0dda2f0 100644
--- a/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r6
+++ b/metadata/md5-cache/sys-kernel/broadcom-sta-dkms-6.30.223.271-r7
@@ -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_=0fac8c4bb2334cdf11cc8be600a1343e
+_md5_=32d044b2d100c235ef9525d6381f50e0
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 591e2041..1de763c7 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -56,7 +56,7 @@ sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEm
 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/bbswitch-dkms 0.8-r2: BBswitch sources for linux
-sys-kernel/broadcom-sta-dkms 6.30.223.271-r6: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
+sys-kernel/broadcom-sta-dkms 6.30.223.271-r7: 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/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r6.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r7.ebuild
index 4f2e01a3..ea214e29 100644
--- a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r6.ebuild
+++ b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r7.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/kernel-4.7-to-kernel-5.10.patch
 	"${FILESDIR}"/kernel-5.17.patch
 	"${FILESDIR}"/kernel-5.18.patch
+	"${FILESDIR}"/kernel-6.0.patch
 )
 
 S="${WORKDIR}"
diff --git a/sys-kernel/broadcom-sta-dkms/files/kernel-6.0.patch b/sys-kernel/broadcom-sta-dkms/files/kernel-6.0.patch
new file mode 100644
index 00000000..dcb55152
--- /dev/null
+++ b/sys-kernel/broadcom-sta-dkms/files/kernel-6.0.patch
@@ -0,0 +1,30 @@
+From dbee29df729e543a89b3f95c1436e982eb0047c1 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Thu, 30 Jun 2022 02:15:35 +0200
+Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 6.0-rc1
+
+Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-33 on Arch Linux.
+---
+ src/wl/sys/wl_cfg80211_hybrid.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index d815b33..7faa735 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -2381,7 +2381,12 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
+ 	ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+ 	struct cfg80211_roam_info roam_info = {
++// Rel. commit "cfg80211: Indicate MLO connection info in connect and roam callbacks" (Veerendranath Jakkam, Wed Jun 8)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+ 		.bss = bss,
++#else
++		.links[0].bss = bss,
++#endif
+ 		.req_ie = conn_info->req_ie,
+ 		.req_ie_len = conn_info->req_ie_len,
+ 		.resp_ie = conn_info->resp_ie,
+-- 
+2.37.0
+