diff options
| author | Koen Vandeputte <koen.vandeputte@citymesh.com> | 2022-10-04 10:48:18 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@citymesh.com> | 2022-10-04 11:22:29 +0200 |
| commit | 45109f69a64c31aa64db05d5de37cd7f6a1aaaa2 (patch) | |
| tree | 92a4ac676c767668f7105c0ba23e39997f6482fd /package | |
| parent | c27b43956407f3adc3cc2693792acd6b40a01877 (diff) | |
| download | upstream-45109f69a64c31aa64db05d5de37cd7f6a1aaaa2.tar.gz upstream-45109f69a64c31aa64db05d5de37cd7f6a1aaaa2.tar.bz2 upstream-45109f69a64c31aa64db05d5de37cd7f6a1aaaa2.zip | |
mac80211: fix compile error when mesh is disabled
This fixes following compile error seen when
building mac80211 with mesh disabled:
.../backports-5.15.58-1/net/mac80211/agg-rx.c: In function 'ieee80211_send_addba_resp':
...backports-5.15.58-1/net/mac80211/agg-rx.c:255:17: error: 'struct sta_info' has no member named 'mesh'
255 | if (!sta->mesh)
| ^~
sta_info.h shows this item as being optional based on flags:
struct mesh_sta *mesh;
Guard the check to fix this.
Fixes: f96744ba6b ("mac80211: mask nested A-MSDU support for mesh")
Signed-off-by: Koen Vandeputte <koen.vandeputte@citymesh.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/subsys/800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch b/package/kernel/mac80211/patches/subsys/800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch index 415c6dfb80..e7da94c9cd 100644 --- a/package/kernel/mac80211/patches/subsys/800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch +++ b/package/kernel/mac80211/patches/subsys/800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch @@ -18,13 +18,15 @@ Signed-off-by: David Bauer <mail@david-bauer.net> --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c -@@ -251,7 +251,9 @@ static void ieee80211_send_addba_resp(st +@@ -251,7 +251,11 @@ static void ieee80211_send_addba_resp(st mgmt->u.action.u.addba_resp.action_code = WLAN_ACTION_ADDBA_RESP; mgmt->u.action.u.addba_resp.dialog_token = dialog_token; - capab = u16_encode_bits(amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK); + capab = 0; ++#ifdef CONFIG_MAC80211_MESH + if (!sta->mesh) ++#endif + capab = u16_encode_bits(amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK); capab |= u16_encode_bits(policy, IEEE80211_ADDBA_PARAM_POLICY_MASK); capab |= u16_encode_bits(tid, IEEE80211_ADDBA_PARAM_TID_MASK); |