From b56a540667bb78128a2f5f14667fce1b2160d6af Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Tue, 31 Mar 2020 11:57:24 -0700 Subject: [PATCH] qcacld-3.0: Fix 40MHz flag setting for 6GHz connection In peer assoc the 40MHz flag is set if HT is enabled and bandwidth is 40MHz which fails the 40MHz setting for 6GHz connection as HT is not supported in 6GHz band. Remove the HT check for 40MHz flag setting in peer assoc. Change-Id: I2a34dd6fbbca50912952f532e8b485148bf3c3a2 CRs-Fixed: 2649524 --- core/wma/src/wma_mgmt.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index e3d50c6f930a..06081ef0b89f 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -1426,15 +1426,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, cmd->ht_flag = 1; cmd->qos_flag = 1; cmd->peer_rate_caps |= WMI_RC_HT_FLAG; - - if (params->ch_width) { - cmd->bw_40 = 1; - cmd->peer_rate_caps |= WMI_RC_CW40_FLAG; - if (params->fShortGI40Mhz) - cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; - } else if (params->fShortGI20Mhz) { - cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; - } } if (params->vhtCapable) { @@ -1444,6 +1435,15 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, cmd->peer_rate_caps |= WMI_RC_HT_FLAG; } + if (params->ch_width) { + cmd->bw_40 = 1; + cmd->peer_rate_caps |= WMI_RC_CW40_FLAG; + if (params->fShortGI40Mhz) + cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; + } else if (params->fShortGI20Mhz) { + cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; + } + if (params->ch_width == CH_WIDTH_80MHZ) cmd->bw_80 = 1; else if (params->ch_width == CH_WIDTH_160MHZ)