mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
From 16bdce2ada5a4c3c91b7c4e81780d2de50bd6ab5 Mon Sep 17 00:00:00 2001
|
|
From: Kalle Valo <kvalo@codeaurora.org>
|
|
Date: Fri, 8 Oct 2021 17:39:32 +0300
|
|
Subject: [PATCH] ath11k: fix m68k and xtensa build failure in
|
|
ath11k_peer_assoc_h_smps()
|
|
|
|
Stephen reported that ath11k was failing to build on m68k and xtensa:
|
|
|
|
In file included from <command-line>:0:0:
|
|
In function 'ath11k_peer_assoc_h_smps',
|
|
inlined from 'ath11k_peer_assoc_prepare' at drivers/net/wireless/ath/ath11k/mac.c:2362:2:
|
|
include/linux/compiler_types.h:317:38: error: call to '__compiletime_assert_650' declared with attribute error: FIELD_GET: type of reg too small for mask
|
|
_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
|
|
^
|
|
include/linux/compiler_types.h:298:4: note: in definition of macro '__compiletime_assert'
|
|
prefix ## suffix(); \
|
|
^
|
|
include/linux/compiler_types.h:317:2: note: in expansion of macro '_compiletime_assert'
|
|
_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
|
|
^
|
|
include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
|
|
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
|
|
^
|
|
include/linux/bitfield.h:52:3: note: in expansion of macro 'BUILD_BUG_ON_MSG'
|
|
BUILD_BUG_ON_MSG((_mask) > (typeof(_reg))~0ull, \
|
|
^
|
|
include/linux/bitfield.h:108:3: note: in expansion of macro '__BF_FIELD_CHECK'
|
|
__BF_FIELD_CHECK(_mask, _reg, 0U, "FIELD_GET: "); \
|
|
^
|
|
drivers/net/wireless/ath/ath11k/mac.c:2079:10: note: in expansion of macro 'FIELD_GET'
|
|
smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS,
|
|
|
|
Fix the issue by using le16_get_bits() to specify the size explicitly.
|
|
|
|
Fixes: 6f4d70308e5e ("ath11k: support SMPS configuration for 6 GHz")
|
|
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -2081,8 +2081,8 @@ static void ath11k_peer_assoc_h_smps(str
|
|
smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
|
|
smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
|
|
} else {
|
|
- smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS,
|
|
- le16_to_cpu(sta->he_6ghz_capa.capa));
|
|
+ smps = le16_get_bits(sta->he_6ghz_capa.capa,
|
|
+ IEEE80211_HE_6GHZ_CAP_SM_PS);
|
|
}
|
|
|
|
switch (smps) {
|