| Message ID | 20221020105217.2890484-1-a.heider@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Hauke Mehrtens |
| Headers | show |
| Series | mac80211: fix masking nested A-MSDU support for mesh | expand |
On 20/10/2022 12:52, Andre Heider wrote: > 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. To elaborate some more: CPTCFG_ comes from the backports project[0] and is already used is multiple patches for this package: $ git grep CPTCFG_ package/kernel/mac80211/patches Thanks, Andre [0] https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/tree/devel/doc/kconfig-operation?h=v5.15.58-1#n87
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);
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> --- .../800-mac80211-mask-nested-A-MSDU-support-for-mesh.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)