diff options
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r7.ebuild (renamed from sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r6.ebuild) | 1 | ||||
-rw-r--r-- | sys-kernel/broadcom-sta-dkms/files/kernel-6.0.patch | 30 |
2 files changed, 31 insertions, 0 deletions
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 + |