aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorAndre Heider <a.heider@gmail.com>2022-10-20 12:52:17 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-10-25 00:32:58 +0200
commit8246ab6a27c1f50a10051055188119230f8f0650 (patch)
treecb3af8a20fdcca17c310f9f9ae84f3de7000a8c4 /package
parente4b9538ddbcc7c98119249f5b862bbb3f3c88cb5 (diff)
downloadupstream-8246ab6a27c1f50a10051055188119230f8f0650.tar.gz
upstream-8246ab6a27c1f50a10051055188119230f8f0650.tar.bz2
upstream-8246ab6a27c1f50a10051055188119230f8f0650.zip
mac80211: fix masking nested A-MSDU support for mesh
CONFIG_MAC80211_MESH isn't defined for this package, rendering the patch useless. Match protecting the access of sta_info.mesh with the very same define declaring it. Fixes 45109f69a6 "mac80211: fix compile error when mesh is disabled" Signed-off-by: Andre Heider <a.heider@gmail.com>
Diffstat (limited to 'package')
-rw-r--r--package/kernel/mac80211/patches/subsys/800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch2
1 files changed, 1 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 e7da94c9cd..a17d6f6161 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
@@ -24,7 +24,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
- capab = u16_encode_bits(amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK);
+ capab = 0;
-+#ifdef CONFIG_MAC80211_MESH
++#ifdef CPTCFG_MAC80211_MESH
+ if (!sta->mesh)
+#endif
+ capab = u16_encode_bits(amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK);