Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 34 lines 1.4 kB view raw
1From cec136ba06039aa2e4441771df855894391db298 Mon Sep 17 00:00:00 2001 2From: Joan Bruguera <joanbrugueram@gmail.com> 3Date: Thu, 30 Jun 2022 02:15:35 +0200 4Subject: [PATCH 14/16] linuxPackages.broadcom_sta: fix build for kernel 6.0+ 5 6Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 6.0-rc1 7 8Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-33 on Arch Linux. 9 10Source: https://gist.github.com/joanbm/207210d74637870c01ef5a3c262a597d 11--- 12 src/wl/sys/wl_cfg80211_hybrid.c | 5 +++++ 13 1 file changed, 5 insertions(+) 14 15diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c 16index c45ad48..9ae56a1 100644 17--- a/src/wl/sys/wl_cfg80211_hybrid.c 18+++ b/src/wl/sys/wl_cfg80211_hybrid.c 19@@ -2354,7 +2354,12 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, 20 bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, 21 ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); 22 struct cfg80211_roam_info roam_info = { 23+// Rel. commit "cfg80211: Indicate MLO connection info in connect and roam callbacks" (Veerendranath Jakkam, Wed Jun 8) 24+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) 25 .bss = bss, 26+#else 27+ .links[0].bss = bss, 28+#endif 29 .req_ie = conn_info->req_ie, 30 .req_ie_len = conn_info->req_ie_len, 31 .resp_ie = conn_info->resp_ie, 32-- 332.45.1 34