History

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.

Kalle Valo committed 5 years ago

Commit 16bdce21 parent 146e5e71 file · +2 −2Browse files

Unified · Split

drivers/net/wireless/ath/ath11k/mac.c+2−2
@@ -2076,8 +2076,8 @@ static void ath11k_peer_assoc_h_smps(struct ieee80211_sta *sta, · 2075 unmodified lines
20762076 smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
20772077 smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
20782078 } else {
2079− smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS,
2080− le16_to_cpu(sta->he_6ghz_capa.capa));
2079+ smps = le16_get_bits(sta->he_6ghz_capa.capa,
2080+ IEEE80211_HE_6GHZ_CAP_SM_PS);
20812081 }
20822082
20832083 switch (smps) {