mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 16:23:26 +00:00
105e8974c0
Fix build issues when building against linux 6.0
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
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
|
|
|