Unverified Commit 05b69c92 authored Aug 23, 2024 by openeuler-ci-bot Committed by Gitee Aug 23, 2024

!11074 wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IC6LEXM5QFEAZD4AD7KHK6VUR4AV7DVN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALEA1 
 
Link:https://gitee.com/openeuler/kernel/pulls/11074

 

Reviewed-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 3c6f6934 e18e4cfb

net/wireless/util.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1189,7 +1189,9 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)
		if (WARN_ON_ONCE(rate->nss < 1 \|\| rate->nss > 8))
		return 0;

		if (rate->bw == RATE_INFO_BW_160)
		if (rate->bw == RATE_INFO_BW_160 \|\|
		(rate->bw == RATE_INFO_BW_HE_RU &&
		rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_2x996))
		result = rates_160M[rate->he_gi];
		else if (rate->bw == RATE_INFO_BW_80 \|\|
		(rate->bw == RATE_INFO_BW_HE_RU &&