diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
| commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
| tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /pkgs/os-specific/linux/broadcom-sta/linux-6.0.patch | |
| parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
| parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'pkgs/os-specific/linux/broadcom-sta/linux-6.0.patch')
| -rw-r--r-- | pkgs/os-specific/linux/broadcom-sta/linux-6.0.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-6.0.patch b/pkgs/os-specific/linux/broadcom-sta/linux-6.0.patch new file mode 100644 index 0000000000000..dcb5515264d37 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-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 + |