Release 4.0.10.007 QCACLD WLAN Driver

Merge remote-tracking branch 'origin/caf/caf-wlan/master'

* origin/caf/caf-wlan/master:
  Cafstaging Release 4.0.10.007
  qcacld-2.0:MAC: Initialize Dynamically allocated Memory.

Change-Id: I6ef1f73f5f41f3b4881d12f96511e92a4479e77d

2 files changed, 30 insertions, 26 deletions

diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 78c45d52a5ec..a0c2871169bf 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            10
 #define QWLAN_VERSION_EXTRA            ""
-#define QWLAN_VERSION_BUILD            006
+#define QWLAN_VERSION_BUILD            007
 
-#define QWLAN_VERSIONSTR               "4.0.10.006"
+#define QWLAN_VERSIONSTR               "4.0.10.007"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/CORE/MAC/src/pe/pmm/pmmApi.c b/CORE/MAC/src/pe/pmm/pmmApi.c
index 57f758197935..84a46c16a231 100644
--- a/CORE/MAC/src/pe/pmm/pmmApi.c
+++ b/CORE/MAC/src/pe/pmm/pmmApi.c
@@ -542,7 +542,7 @@ tSirRetStatus pmmSendChangePowerSaveMsg(tpAniSirGlobal pMac)
         return retStatus;
     }
 
-    vos_mem_set( (tANI_U8 *)pExitBmpsParams, sizeof(*pExitBmpsParams), 0);
+    vos_mem_zero(pExitBmpsParams, sizeof(*pExitBmpsParams));
     msgQ.type = WDA_EXIT_BMPS_REQ;
     msgQ.reserved = 0;
     msgQ.bodyptr = pExitBmpsParams;
@@ -616,13 +616,15 @@ tSirRetStatus  pmmSendInitPowerSaveMsg(tpAniSirGlobal pMac,tpPESession psessionE
         return eSIR_FAILURE;
     }
 
-    pBmpsParams = vos_mem_malloc(sizeof(tEnterBmpsParams));
+    pBmpsParams = vos_mem_malloc(sizeof(*pBmpsParams));
     if ( NULL == pBmpsParams )
     {
         pmmLog(pMac, LOGP, "PMM: Not able to allocate memory for Enter Bmps");
         return eSIR_FAILURE;
     }
 
+    vos_mem_zero(pBmpsParams, sizeof(*pBmpsParams));
+
     pMac->pmm.inMissedBeaconScenario = FALSE;
     pBmpsParams->respReqd = TRUE;
 
@@ -1146,13 +1148,13 @@ void pmmProcessMessage(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
             tpSirPowerSaveCfg pPSCfg;
             tSirMbMsg *pMbMsg = (tSirMbMsg *)pMsg->bodyptr;
 
-            pPSCfg = vos_mem_malloc(sizeof(tSirPowerSaveCfg));
+            pPSCfg = vos_mem_malloc(sizeof(*pPSCfg));
             if ( NULL == pPSCfg )
             {
                 pmmLog(pMac, LOGP, "PMM: Not able to allocate memory for PMC Config");
             }
-            (void) vos_mem_copy(pPSCfg, pMbMsg->data, sizeof(tSirPowerSaveCfg));
-            (void) pmmSendPowerSaveCfg(pMac, pPSCfg);
+            vos_mem_copy(pPSCfg, pMbMsg->data, sizeof(*pPSCfg));
+            pmmSendPowerSaveCfg(pMac, pPSCfg);
         }
             break;
 
@@ -1169,13 +1171,13 @@ void pmmProcessMessage(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
             tpExitBmpsInfo  pExitBmpsInfo;
             tSirMbMsg      *pMbMsg = (tSirMbMsg *)pMsg->bodyptr;
 
-            pExitBmpsInfo = vos_mem_malloc(sizeof(tExitBmpsInfo));
+            pExitBmpsInfo = vos_mem_malloc(sizeof(*pExitBmpsInfo));
             if ( NULL == pExitBmpsInfo )
             {
                 pmmLog(pMac, LOGP, "PMM: Failed to allocate memory for Exit BMPS Info ");
             }
-            (void) vos_mem_copy(pExitBmpsInfo, pMbMsg->data, sizeof(tExitBmpsInfo));
-            (void) pmmExitBmpsRequestHandler(pMac, pExitBmpsInfo);
+            vos_mem_copy(pExitBmpsInfo, pMbMsg->data, sizeof(*pExitBmpsInfo));
+            pmmExitBmpsRequestHandler(pMac, pExitBmpsInfo);
         }
             break;
 
@@ -1910,7 +1912,7 @@ void pmmSendWowlAddBcastPtrn(tpAniSirGlobal pMac,  tpSirMsgQ pMsg)
         pmmLog(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern "));
         return;
     }
-    (void) vos_mem_copy(pBcastPtrn, pMbMsg->data, sizeof(*pBcastPtrn));
+    vos_mem_copy(pBcastPtrn, pMbMsg->data, sizeof(*pBcastPtrn));
 
     if (NULL == pBcastPtrn)
     {
@@ -1958,7 +1960,7 @@ void pmmSendWowlDelBcastPtrn(tpAniSirGlobal pMac, tpSirMsgQ pMsg)
         pmmLog(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Delete Bcast Pattern "));
         return;
     }
-    (void) vos_mem_copy(pDeletePtrn, pMbMsg->data, sizeof(*pDeletePtrn));
+    vos_mem_copy(pDeletePtrn, pMbMsg->data, sizeof(*pDeletePtrn));
 
     if (NULL == pDeletePtrn)
     {
@@ -2044,13 +2046,13 @@ skip_pmm_state_check:
         pmmLog(pMac, LOGP, FL("Fail to allocate memory for Enter Wowl Request "));
         goto end;
     }
-    (void) vos_mem_set((tANI_U8 *)pHalWowlParams, sizeof(*pHalWowlParams), 0);
+    vos_mem_zero(pHalWowlParams, sizeof(*pHalWowlParams));
 
     // fill in the message field
     pHalWowlParams->ucMagicPktEnable = pSmeWowlParams->ucMagicPktEnable;
     pHalWowlParams->ucPatternFilteringEnable = pSmeWowlParams->ucPatternFilteringEnable;
-    (void)vos_mem_copy( (tANI_U8 *)pHalWowlParams->magicPtrn, (tANI_U8 *)pSmeWowlParams->magicPtrn,
-                         sizeof(tSirMacAddr) );
+    vos_mem_copy(pHalWowlParams->magicPtrn,
+                pSmeWowlParams->magicPtrn, sizeof(tSirMacAddr));
 
 #ifdef WLAN_WAKEUP_EVENTS
     pHalWowlParams->ucWoWEAPIDRequestEnable = pSmeWowlParams->ucWoWEAPIDRequestEnable;
@@ -2267,7 +2269,7 @@ skip_pe_session_lookup:
         goto failure;
     }
 
-    (void) vos_mem_set((tANI_U8 *)pHalWowlMsg, sizeof(*pHalWowlMsg), 0);
+    vos_mem_zero(pHalWowlMsg, sizeof(*pHalWowlMsg));
 
     if (!pMac->psOffloadEnabled)
           pHalWowlMsg->bssIdx = pSessionEntry->bssIdx;
@@ -2457,7 +2459,7 @@ tSirRetStatus pmmUapsdSendChangePwrSaveMsg (tpAniSirGlobal pMac, tANI_U8 mode)
 
     if (SIR_PM_SLEEP_MODE == mode)
     {
-        pUapsdParams = vos_mem_malloc(sizeof(tUapsdParams));
+        pUapsdParams = vos_mem_malloc(sizeof(*pUapsdParams));
         if ( NULL == pUapsdParams )
         {
             PELOGW(pmmLog(pMac, LOGW, FL("pmmUapsd : failed to allocate memory"));)
@@ -2465,7 +2467,7 @@ tSirRetStatus pmmUapsdSendChangePwrSaveMsg (tpAniSirGlobal pMac, tANI_U8 mode)
             return retStatus;
         }
 
-        vos_mem_set( (tANI_U8 *)pUapsdParams, sizeof(tUapsdParams), 0);
+        vos_mem_zero(pUapsdParams, sizeof(*pUapsdParams));
         msgQ.type = WDA_ENTER_UAPSD_REQ;
         msgQ.bodyptr = pUapsdParams;
 
@@ -2571,7 +2573,7 @@ tSirRetStatus pmmUapsdSendChangePwrSaveMsg (tpAniSirGlobal pMac, tANI_U8 mode)
     }
     else
     {
-        pExitUapsdParams = vos_mem_malloc(sizeof(tExitUapsdParams));
+        pExitUapsdParams = vos_mem_malloc(sizeof(*pExitUapsdParams));
         if ( NULL == pExitUapsdParams )
         {
             PELOGW(pmmLog(pMac, LOGW, FL("pmmUapsd : failed to allocate memory"));)
@@ -2579,7 +2581,7 @@ tSirRetStatus pmmUapsdSendChangePwrSaveMsg (tpAniSirGlobal pMac, tANI_U8 mode)
             return retStatus;
         }
 
-        vos_mem_set( (tANI_U8 *)pExitUapsdParams, sizeof(tExitUapsdParams), 0);
+        vos_mem_zero(pExitUapsdParams, sizeof(*pExitUapsdParams));
         msgQ.type = WDA_EXIT_UAPSD_REQ;
         msgQ.bodyptr = pExitUapsdParams;
         pExitUapsdParams->bssIdx = pSessionEntry->bssIdx;
@@ -3095,7 +3097,7 @@ tSirRetStatus pmmOffloadEnterBmpsReqHandler(tpAniSirGlobal pMac,
         return eSIR_SUCCESS;
     }
 
-    pEnablePsReqParams = vos_mem_malloc(sizeof(tEnablePsParams));
+    pEnablePsReqParams = vos_mem_malloc(sizeof(*pEnablePsReqParams));
     if (NULL == pEnablePsReqParams)
     {
         pmmLog(pMac, LOGE,
@@ -3106,7 +3108,7 @@ tSirRetStatus pmmOffloadEnterBmpsReqHandler(tpAniSirGlobal pMac,
         return eSIR_MEM_ALLOC_FAILED;
     }
 
-    vos_mem_zero(pEnablePsReqParams, sizeof(tEnablePsParams));
+    vos_mem_zero(pEnablePsReqParams, sizeof(*pEnablePsReqParams));
     /* Fill the BSSID  corresponding to PS Req */
     vos_mem_copy(pEnablePsReqParams->bssid, psReqData->bssId,
                  sizeof(tSirMacAddr));
@@ -3243,7 +3245,7 @@ tSirRetStatus pmmOffloadExitBmpsReqHandler(tpAniSirGlobal pMac,
         return eSIR_FAILURE;
     }
 
-    pDisablePsReqParams = vos_mem_malloc(sizeof(tDisablePsParams));
+    pDisablePsReqParams = vos_mem_malloc(sizeof(*pDisablePsReqParams));
     if (NULL == pDisablePsReqParams)
     {
         pmmLog(pMac, LOGE, FL("Memory allocation failed for tDisablePsParams"));
@@ -3253,7 +3255,7 @@ tSirRetStatus pmmOffloadExitBmpsReqHandler(tpAniSirGlobal pMac,
         return eSIR_MEM_ALLOC_FAILED;
     }
 
-    vos_mem_zero(pDisablePsReqParams, sizeof(tDisablePsParams));
+    vos_mem_zero(pDisablePsReqParams, sizeof(*pDisablePsReqParams));
     /* Fill the BSSID  corresponding to PS Req */
     vos_mem_copy(pDisablePsReqParams->bssid, psReqData->bssId,
                  sizeof(tSirMacAddr));
@@ -3371,7 +3373,7 @@ tSirRetStatus pmmOffloadEnterUapsdReqHandler(tpAniSirGlobal pMac,
         return eSIR_FAILURE;
     }
 
-    pEnableUapsdReqParams = vos_mem_malloc(sizeof(tEnableUapsdParams));
+    pEnableUapsdReqParams = vos_mem_malloc(sizeof(*pEnableUapsdReqParams));
     if (NULL == pEnableUapsdReqParams)
     {
         pmmLog(pMac, LOGE,
@@ -3379,6 +3381,7 @@ tSirRetStatus pmmOffloadEnterUapsdReqHandler(tpAniSirGlobal pMac,
         return eSIR_MEM_ALLOC_FAILED;
     }
 
+    vos_mem_zero(pEnableUapsdReqParams, sizeof(*pEnableUapsdReqParams));
     uapsdDeliveryMask = (psessionEntry->gUapsdPerAcBitmask |
                          psessionEntry->gUapsdPerAcDeliveryEnableMask);
 
@@ -3519,7 +3522,7 @@ tSirRetStatus pmmOffloadExitUapsdReqHandler(tpAniSirGlobal pMac,
         return eSIR_FAILURE;
     }
 
-    pDisableUapsdReqParams = vos_mem_malloc(sizeof(tDisablePsParams));
+    pDisableUapsdReqParams = vos_mem_malloc(sizeof(*pDisableUapsdReqParams));
     if (NULL == pDisableUapsdReqParams)
     {
         pmmLog(pMac, LOGE,
@@ -3527,6 +3530,7 @@ tSirRetStatus pmmOffloadExitUapsdReqHandler(tpAniSirGlobal pMac,
         return eSIR_MEM_ALLOC_FAILED;
     }
 
+    vos_mem_zero(pDisableUapsdReqParams, sizeof(*pDisableUapsdReqParams));
     /* Fill the BSSID  corresponding to PS Req */
     vos_mem_copy(pDisableUapsdReqParams->bssid, psReqData->bssId,
                  sizeof(tSirMacAddr));