From 59f546c6ac10e3095bb633af4752e03518dff367 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 16 Feb 2016 10:31:55 -0800 Subject: [PATCH] qcacld-3.0: Fix incorrect flags setting in peer assoc command qcacld-2.0 to qcacld-3.0 propagation. Fix incorrect flag setting while sending peer assoc command. This change set will add a check before setting 40MHZ support bit and shortGI support bit in the peer flags. If the peer is not HT capable, these flags should not be set. Change-Id: I89d43bd86b97637b291dc871aaf7e2a3269df853 CRs-Fixed: 974242 --- core/wma/src/wma_mgmt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index cc4fc88e9366..5c4251cc5b5a 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -890,15 +890,16 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, if (params->htCapable) { cmd->peer_flags |= (WMI_PEER_HT | WMI_PEER_QOS); cmd->peer_rate_caps |= WMI_RC_HT_FLAG; - } - if (params->ch_width) { - cmd->peer_flags |= WMI_PEER_40MHZ; - cmd->peer_rate_caps |= WMI_RC_CW40_FLAG; - if (params->fShortGI40Mhz) + if (params->ch_width) { + cmd->peer_flags |= WMI_PEER_40MHZ; + 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; - } else if (params->fShortGI20Mhz) - cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; + } + } #ifdef WLAN_FEATURE_11AC if (params->vhtCapable) {