commit bca5b00453a23d7dc3d016e5e37a4fd175e8eec8
author Hardik Kantilal Patel <hkpatel@qti.qualcomm.com> Mon Jan 19 15:30:18 2015 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Wed Jan 21 12:45:27 2015 +0530
tree 0d79f4b98052165fe197e5874ace9e0941511c03
parent 851d986d73791e6bc9c6f458f69bf58c66a782cb

wlan:STAHT40 2.4GHz: Set 20/40 BSS Coex Support bit in Extended Capabilities

Set 20/40 BSS Coexistence Management Support bit in Extended
Capabilities IEs for Assoc Request Frame.

Change-Id: I69a9f7e5c9c5cae4065b4cf7c3a11e105aada4ee
CRs-Fixed: 783238

CORE/MAC/src/pe/lim/limSendManagementFrames.c

diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index f6de862..73c480a 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -317,7 +317,6 @@
     tANI_U8              sessionId;
     tANI_U8             *p2pIe = NULL;
     tANI_U32             txFlag = 0;
-    tANI_U32             chanbond24G = 0;
 
 #ifndef GEN4_SCAN
     return eSIR_FAILURE;
@@ -414,9 +413,9 @@
            }
     }
 
-    /* Get HT40 capability  for 2.4GHz band */
-    wlan_cfgGetInt(pMac,WNI_CFG_CHANNEL_BONDING_24G,&chanbond24G);
-    if( (nChannelNum <= SIR_11B_CHANNEL_END) && chanbond24G != TRUE)
+    if((nChannelNum <= SIR_11B_CHANNEL_END)
+       && (!IS_HT40_OBSS_SCAN_FEATURE_ENABLE)
+       && (!pMac->roam.configParam.channelBondingMode24GHz))
     {
         pr.HTCaps.supportedChannelWidthSet = eHT_CHANNEL_WIDTH_20MHZ;
         pr.HTCaps.shortGI40MHz = 0;