archrelease: copy trunk to community-x86_64
[ArchLinux/community.git] / broadcom-wl-dkms / trunk / 015-linux600.patch
blob8645907bbae42ed0db7ec757816b8de0ddb01474
1 From 933540c63f33e6ac2825d65c4b681ef3387d9146 Mon Sep 17 00:00:00 2001
2 From: Antoine Cotten <hello@acotten.com>
3 Date: Mon, 15 Aug 2022 17:53:51 +0200
4 Subject: [PATCH] cfg80211_roam_info compat for MLO APIs in Linux >= 6.0
6 The 'bssid' struct field is now under 'links.bssid'.
8 See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=efbabc11650040c64884ff3019b88c7bcc0ceb1d
10 Original patch by Joan Bruguera:
11 https://gist.github.com/joanbm/207210d74637870c01ef5a3c262a597d
12 ---
13 src/wl/sys/wl_cfg80211_hybrid.c | 4 ++++
14 1 file changed, 4 insertions(+)
16 diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
17 index 5e9e6d3..5ec35c5 100644
18 --- a/src/wl/sys/wl_cfg80211_hybrid.c
19 +++ b/src/wl/sys/wl_cfg80211_hybrid.c
20 @@ -2412,7 +2412,11 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev,
21 struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
22 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
23 struct cfg80211_roam_info roam_info = {
24 +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
25 .bssid = wl->profile->bssid,
26 +#else
27 + .links[0].bssid = wl->profile->bssid,
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,