From fddd0545f44ea6e0b1f7eacf6a8817a165cd913f Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Tue, 31 Aug 2021 13:31:56 +0800 Subject: [PATCH] qcacld-3.0: Need check both HTCaps and HTInfo for channel width Some AP indicates it support 40M in HTInfo, while not support 40M in HTCaps, so need intersect HTInfo and HTCaps. Change-Id: I496b62f50a2e1e19aeef7e77535d0479f31bba44 CRs-Fixed: 3025951 --- core/mac/src/pe/lim/lim_ft.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 0138255706b6..5f56d9802764 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -632,7 +632,8 @@ void lim_fill_ft_session(struct mac_context *mac, } ft_session->htSupportedChannelWidthSet = (pBeaconStruct->HTInfo.present) ? - (cbEnabledMode && pBeaconStruct->HTInfo.recommendedTxWidthSet) : 0; + (cbEnabledMode && pBeaconStruct->HTInfo.recommendedTxWidthSet && + pBeaconStruct->HTCaps.supportedChannelWidthSet) : 0; ft_session->htRecommendedTxWidthSet = ft_session->htSupportedChannelWidthSet;