Merge "Release 1.0.0.241 QCACLD WLAN Driver"

4 files changed, 37 insertions, 61 deletions

diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index e2fc849ee23d..0b543c89e705 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -42,9 +42,9 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            0
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            240
+#define QWLAN_VERSION_BUILD            241
 
-#define QWLAN_VERSIONSTR               "1.0.0.240"
+#define QWLAN_VERSIONSTR               "1.0.0.241"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index e2c7867beaa2..1e506cb139c8 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -810,30 +810,28 @@ __limHandleSmeStartBssRequest(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
                                                 " channel %d"),channelNumber);
                 }
 
+                /*
+                 * For Sta+p2p-Go concurrency
+                 * vhtTxChannelWidthSet is used for storing p2p-GO channel width
+                 *  apChanWidth is used for storing the AP channel width that
+                 * the Sta is going to associate.
+                 * Initialize the apChanWidth same as p2p-GO channel width this
+                 * gets over written once the station joins the AP
+                 */
                 if(chanWidth == eHT_CHANNEL_WIDTH_20MHZ ||
                                 chanWidth == eHT_CHANNEL_WIDTH_40MHZ)
                 {
-                    if (cfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH,
-                                     WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ)
-                                                             != eSIR_SUCCESS)
-                    {
-                        limLog(pMac, LOGP, FL("could not set "
-                                     " WNI_CFG_CHANNEL_BONDING_MODE at CFG"));
-                        retCode = eSIR_LOGP_EXCEPTION;
-                         goto free;
-                    }
+                    psessionEntry->vhtTxChannelWidthSet =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ;
+                    psessionEntry->apChanWidth =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ;
                 }
                 if (chanWidth == eHT_CHANNEL_WIDTH_80MHZ)
                 {
-                    if (cfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH,
-                                           WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
-                                                               != eSIR_SUCCESS)
-                    {
-                        limLog(pMac, LOGP, FL("could not set "
-                                     " WNI_CFG_CHANNEL_BONDING_MODE at CFG"));
-                        retCode = eSIR_LOGP_EXCEPTION;
-                         goto free;
-                    }
+                    psessionEntry->vhtTxChannelWidthSet =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ;
+                    psessionEntry->apChanWidth =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ;
 
                     centerChan = limGetCenterChannel( pMac, channelNumber,
                                          pSmeStartBssReq->cbMode,
@@ -857,23 +855,6 @@ __limHandleSmeStartBssRequest(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf)
 
                 if(chanWidth == eHT_CHANNEL_WIDTH_20MHZ)
                     psessionEntry->htSupportedChannelWidthSet = 0;
-                /* All the translation is done by now for gVhtChannelWidth
-                 * from .ini file to the actual values as defined in spec.
-                 * So, grabing the spec value which is
-                 * updated in .dat file by the above logic */
-                if (wlan_cfgGetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH,
-                                   &chanWidth) != eSIR_SUCCESS)
-                {
-                    limLog(pMac, LOGP,
-                      FL("Unable to retrieve Channel Width from CFG"));
-                }
-                /*For Sta+p2p-Go concurrency
-                  vhtTxChannelWidthSet is used for storing p2p-GO channel width
-                  apChanWidth is used for storing the AP channel width that the Sta is going to associate.
-                  Initialize the apChanWidth same as p2p-GO channel width this gets over written once the station joins the AP
-                */
-                psessionEntry->vhtTxChannelWidthSet = chanWidth;
-                psessionEntry->apChanWidth = chanWidth;
             }
             psessionEntry->htSecondaryChannelOffset = limGetHTCBState(pSmeStartBssReq->cbMode);
 #endif
@@ -5979,11 +5960,10 @@ limProcessSmeChannelChangeRequest(tpAniSirGlobal pMac, tANI_U32 *pMsg)
 
                 if(chanWidth == eHT_CHANNEL_WIDTH_20MHZ || chanWidth == eHT_CHANNEL_WIDTH_40MHZ)
                 {
-                    if (cfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH, WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ)
-                                                                     != eSIR_SUCCESS)
-                    {
-                        limLog(pMac, LOGP, FL("could not set  WNI_CFG_CHANNEL_BONDING_MODE at CFG"));
-                    }
+                    psessionEntry->vhtTxChannelWidthSet =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ;
+                    psessionEntry->apChanWidth =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ;
                     /*
                      * In case of DFS operation, If AP falls back to lower
                      * bandwidth [< 80Mhz] then there is no need of
@@ -6001,11 +5981,10 @@ limProcessSmeChannelChangeRequest(tpAniSirGlobal pMac, tANI_U32 *pMsg)
                 }
                 if (chanWidth == eHT_CHANNEL_WIDTH_80MHZ)
                 {
-                    if (cfgSetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH, WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ)
-                                                                     != eSIR_SUCCESS)
-                    {
-                        limLog(pMac, LOGP, FL("could not set  WNI_CFG_CHANNEL_BONDING_MODE at CFG"));
-                    }
+                    psessionEntry->vhtTxChannelWidthSet =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ;
+                    psessionEntry->apChanWidth =
+                                           WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ;
 
                     centerChan = limGetCenterChannel(pMac, pChannelChangeReq->targetChannel,
                                     pChannelChangeReq->cbMode,WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ);
@@ -6021,17 +6000,6 @@ limProcessSmeChannelChangeRequest(tpAniSirGlobal pMac, tANI_U32 *pMsg)
                     }
                 }
 
-                /* All the translation is done by now for gVhtChannelWidth from .ini file to
-                 * the actual values as defined in spec. So, grabing the spec value which is
-                 * updated in .dat file by the above logic */
-                if (wlan_cfgGetInt(pMac, WNI_CFG_VHT_CHANNEL_WIDTH,
-                                   &chanWidth) != eSIR_SUCCESS)
-                {
-                    limLog(pMac, LOGP,
-                      FL("Unable to retrieve Channel Width from CFG"));
-                }
-                psessionEntry->vhtTxChannelWidthSet = chanWidth;
-                psessionEntry->apChanWidth = chanWidth;
             }
             psessionEntry->htSecondaryChannelOffset = limGetHTCBState(pChannelChangeReq->cbMode);
             psessionEntry->htSupportedChannelWidthSet = (pChannelChangeReq->cbMode ? 1 : 0);
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 1404e78b9f92..bc5eb3a0a5ae 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -17827,6 +17827,15 @@ static VOS_STATUS wma_feed_wow_config_to_fw(tp_wma_handle wma,
 	else
 		WMA_LOGD("CSA IE match is enabled in fw");
 
+	ret = wma_add_wow_wakeup_event(wma, WOW_CLIENT_KICKOUT_EVENT, TRUE);
+
+	if (ret != VOS_STATUS_SUCCESS) {
+		WMA_LOGE("Failed to configure WOW_CLIENT_KICKOUT_EVENT");
+		goto end;
+	}
+	else
+		WMA_LOGD("CLIENT_KICKOUT_EVENT is enabled in fw");
+
 	/*
 	 * Configure pattern match wakeup event. FW does pattern match
 	 * only if pattern match event is enabled.
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index e0bb0fe454b6..fdb12ee57ae1 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -962,13 +962,12 @@ PopulateDot11fVHTOperation(tpAniSirGlobal   pMac,
     pDot11f->present = 1;
 
     if (psessionEntry->htSupportedChannelWidthSet) {
-        CFG_GET_INT( nStatus, pMac, WNI_CFG_VHT_CHANNEL_WIDTH, nCfgValue );
-        pDot11f->chanWidth = (tANI_U8)nCfgValue;
+        pDot11f->chanWidth = psessionEntry->vhtTxChannelWidthSet;
+        pDot11f->chanCenterFreqSeg1 = psessionEntry->apCenterChan;
     } else {
         pDot11f->chanWidth = 0;
     }
 
-    pDot11f->chanCenterFreqSeg1 = psessionEntry->apCenterChan;
 
     nCfgValue = 0;
     CFG_GET_INT( nStatus, pMac, WNI_CFG_VHT_CHANNEL_CENTER_FREQ_SEGMENT2,