Unverified Commit 28a1e2d3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11075 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/TM4LHFJRL4R45T47XQXUKVQ6OS7NMENO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALEA1 
 
Link:https://gitee.com/openeuler/kernel/pulls/11075

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 59a5f7e9 c7439305

net/wireless/util.c

+3 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,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 &&