commit d65d218d3be5da72150feaf93a2016d7de9020a6
author c_hpothu <c_hpothu@qti.qualcomm.com> Fri Jun 06 21:18:17 2014 +0530
committer Kiet Lam <c_kietl@qca.qualcomm.com> Tue Jun 10 16:25:36 2014 -0700
tree 857c77883b4c2d8d802ee7572d8fc31aea8e877c
parent addb08b1e837a10f4b52fd6c447195a67b09ed9a

wlan: Update supported Channel Width based on channel bonding ini param.

If channel bonding is disabled ini parameter gChannelBondingMode5GHz,
then in ASSOC-REQ, HOST won't set HT40. But some APs sends ASSOC-RSP
with HT40 enabled, causing incorrect updation of
htSupportedChannelWidthSet.

Update htSupportedChannelWidthSet and vhtSupportedChannelWidthSet
based on ini parameter gChannelBondingMode5GHz.

Change-Id: Ic652c3fab0b15718798c70c6a1f094f7dfb18e04
CRs-Fixed: 675251.

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

diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
index be06a71..59bcb75 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
@@ -116,9 +116,16 @@
     
            if ( pAssocRsp->HTCaps.present ) {
                pStaDs->htGreenfield = ( tANI_U8 ) pAssocRsp->HTCaps.greenField;
-               pStaDs->htSupportedChannelWidthSet = ( tANI_U8 ) (pAssocRsp->HTCaps.supportedChannelWidthSet ? 
+               if (psessionEntry->htSupportedChannelWidthSet)
+               {
+                   pStaDs->htSupportedChannelWidthSet = ( tANI_U8 ) (pAssocRsp->HTCaps.supportedChannelWidthSet ?
                                                                                pAssocRsp->HTInfo.recommendedTxWidthSet : 
                                                                                pAssocRsp->HTCaps.supportedChannelWidthSet );
+               }
+               else
+               {
+                   pStaDs->htSupportedChannelWidthSet = eHT_CHANNEL_WIDTH_20MHZ;
+               }
                    pStaDs->htLsigTXOPProtection = ( tANI_U8 ) pAssocRsp->HTCaps.lsigTXOPProtection;
                    pStaDs->htMIMOPSState =  (tSirMacHTMIMOPowerSaveState)pAssocRsp->HTCaps.mimoPowerSave;
                    pStaDs->htMaxAmsduLength = ( tANI_U8 ) pAssocRsp->HTCaps.maximalAMSDUsize;
@@ -143,6 +150,8 @@
        if(IS_DOT11_MODE_VHT(psessionEntry->dot11mode))
        {
            pStaDs->mlmStaContext.vhtCapability = pAssocRsp->VHTCaps.present;
+           if (pAssocRsp->VHTCaps.present && psessionEntry->htSupportedChannelWidthSet)
+               pStaDs->vhtSupportedChannelWidthSet = pAssocRsp->VHTOperation.chanWidth;
        }
        if (limPopulatePeerRateSet(pMac, &pStaDs->supportedRates,
                                 pAssocRsp->HTCaps.supportedMCSSet,