Release 1.0.0.218 QCACLD WLAN Driver

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

* origin/caf/caf-wlan/master:
  Cafstaging Release 1.0.0.218
  WLAN: add NULL check for sc->hostdef
  qcacld: Remove un-used code under macro else section of GEN4_SCAN
  wlan: qcacld: Send DelTs msg to Firmware regardless of ACM enabled
  qcacld: Fix incorrect comments
  qcacld: WMA: Fix allocation length size in event handlers

Change-Id: I85c3eb73d4122c431bb68117aa5ef16860243a44

12 files changed, 9 insertions, 36 deletions

diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index aff59d5682f4..78ee9f7eee08 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -512,7 +512,6 @@ typedef struct sAniSirLim
     /// Previous MLM State
     tLimMlmStates       gLimPrevMlmState;
 
-#ifdef GEN4_SCAN
     // LIM to HAL SCAN Management Message Interface states
     tLimLimHalScanState gLimHalScanState;
 //WLAN_SUSPEND_LINK Related
@@ -527,7 +526,6 @@ typedef struct sAniSirLim
     //current channel. CB state goes along with channel to resume to
     tANI_U16    gResumeChannel;
     ePhyChanBondState    gResumePhyCbState;
-#endif // GEN4_SCAN
 
     // Change channel generic scheme
     CHANGE_CHANNEL_CALLBACK gpchangeChannelCallback;
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index f689deda8969..f0c867f993af 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            217
+#define QWLAN_VERSION_BUILD            218
 
-#define QWLAN_VERSIONSTR               "1.0.0.217"
+#define QWLAN_VERSIONSTR               "1.0.0.218"
 
 
 #define AR6320_REV1_VERSION             0x5000000
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index dd27b7f46be8..ac625c4ccc6c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -320,17 +320,12 @@ typedef enum eSirResultCodes
     eSIR_SME_CHANNEL_SWITCH_FAIL,        // failed to send out Channel Switch Action Frame
     eSIR_SME_INVALID_STA_ROLE,
     eSIR_SME_INVALID_STATE,
-#ifdef GEN4_SCAN
     eSIR_SME_CHANNEL_SWITCH_DISABLED,    // either 11h is disabled or channelSwitch is currently active
     eSIR_SME_HAL_SCAN_INIT_FAILED,       // SIR_HAL_SIR_HAL_INIT_SCAN_RSP returned failed status
     eSIR_SME_HAL_SCAN_START_FAILED,      // SIR_HAL_START_SCAN_RSP returned failed status
     eSIR_SME_HAL_SCAN_END_FAILED,        // SIR_HAL_END_SCAN_RSP returned failed status
     eSIR_SME_HAL_SCAN_FINISH_FAILED,     // SIR_HAL_FINISH_SCAN_RSP returned failed status
     eSIR_SME_HAL_SEND_MESSAGE_FAIL,      // Failed to send a message to HAL
-#else // GEN4_SCAN
-    eSIR_SME_CHANNEL_SWITCH_DISABLED,    // either 11h is disabled or channelSwitch is currently active
-    eSIR_SME_HAL_SEND_MESSAGE_FAIL,      // Failed to send a message to HAL
-#endif // GEN4_SCAN
 #ifdef FEATURE_OEM_DATA_SUPPORT
     eSIR_SME_HAL_OEM_DATA_REQ_START_FAILED,
 #endif
@@ -4744,7 +4739,7 @@ typedef struct
 #ifdef WLAN_FEATURE_NAN
 typedef struct
 {
-    tANI_U16 event_data_len;
+    tANI_U32 event_data_len;
     tANI_U8  event_data[];
 } tSirNanEvent, *tpSirNanEvent;
 #endif
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index 9dd6542190b9..bf638f172e8e 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -80,10 +80,7 @@
 #define SIR_MAC_CTRL_CF_END     14
 #define SIR_MAC_CTRL_CF_END_ACK 15
 
-#define GEN4_SCAN         1
-#ifdef GEN4_SCAN
 #define SIR_MAC_MAX_DURATION_MICRO_SECONDS       32767
-#endif // GEN4_SCAN
 
 // Data frame subtype definitions
 #define SIR_MAC_DATA_DATA                 0
diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h
index fd4c704bb859..bf3f1e99a33a 100644
--- a/CORE/MAC/src/pe/include/limGlobal.h
+++ b/CORE/MAC/src/pe/include/limGlobal.h
@@ -207,7 +207,6 @@ typedef enum eLimDot11hChanSwStates
     eLIM_11H_CHANSW_END
 } tLimDot11hChanSwStates;
 
-#ifdef GEN4_SCAN
 
 //WLAN_SUSPEND_LINK Related
 typedef void (*SUSPEND_RESUME_LINK_CALLBACK)(tpAniSirGlobal pMac, eHalStatus status, tANI_U32 *data);
@@ -231,7 +230,6 @@ typedef enum eLimHalScanState
   eLIM_HAL_RESUME_LINK_WAIT_STATE,
 //end WLAN_SUSPEND_LINK Related
 } tLimLimHalScanState;
-#endif // GEN4_SCAN
 
 // LIM states related to A-MPDU/BA
 // This is used for maintaining the state between PE and HAL only.
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index 9542f879e87d..359c16a0e0b7 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -206,10 +206,8 @@ static void __limInitStates(tpAniSirGlobal pMac)
     /// Previous MLM State
     pMac->lim.gLimPrevMlmState = eLIM_MLM_OFFLINE_STATE;
 
-#ifdef GEN4_SCAN
     // LIM to HAL SCAN Management Message Interface states
     pMac->lim.gLimHalScanState = eLIM_HAL_IDLE_SCAN_STATE;
-#endif // GEN4_SCAN
 
     /**
      * Initialize state to eLIM_SME_OFFLINE_STATE
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index ced3f8bff9ba..688daba7c1a9 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -394,9 +394,6 @@ limSendProbeReqMgmtFrame(tpAniSirGlobal pMac,
     tANI_U8             txFlag = 0;
     tANI_U8             smeSessionId = 0;
 
-#ifndef GEN4_SCAN
-    return eSIR_FAILURE;
-#endif
 
 
     /* The probe req should not send 11ac capabilieties if band is 2.4GHz,
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 15226d109a98..3a5889aa2b52 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -778,7 +778,6 @@ void limProcessMlmSetBssKeyRsp( tpAniSirGlobal pMac, tpSirMsgQ limMsgQ );
 
 
 
-#ifdef GEN4_SCAN
 // Function to process WDA_INIT_SCAN_RSP message
 void limProcessInitScanRsp(tpAniSirGlobal,  void * );
 
@@ -808,7 +807,6 @@ tANI_U8 limIsLinkSuspended(tpAniSirGlobal pMac);
 void limSuspendLink(tpAniSirGlobal, tSirLinkTrafficCheck, SUSPEND_RESUME_LINK_CALLBACK, tANI_U32*);
 void limResumeLink(tpAniSirGlobal, SUSPEND_RESUME_LINK_CALLBACK, tANI_U32*);
 //end WLAN_SUSPEND_LINK Related
-#endif // GEN4_SCAN
 
 tSirRetStatus limSendAddBAReq( tpAniSirGlobal pMac,
     tpLimMlmAddBAReq pMlmAddBAReq,tpPESession);
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index 29fe118d1e84..0a0e763ca317 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -530,7 +530,6 @@ char *limResultCodeStr(tSirResultCodes resultCode)
             return "eSIR_SME_RECEIVED";
       case eSIR_SME_CHANNEL_SWITCH_FAIL:
             return "eSIR_SME_CHANNEL_SWITCH_FAIL";
-#ifdef GEN4_SCAN
       case eSIR_SME_CHANNEL_SWITCH_DISABLED:
             return "eSIR_SME_CHANNEL_SWITCH_DISABLED";
       case eSIR_SME_HAL_SCAN_INIT_FAILED:
@@ -543,12 +542,6 @@ char *limResultCodeStr(tSirResultCodes resultCode)
             return "eSIR_SME_HAL_SCAN_FINISH_FAILED";
       case eSIR_SME_HAL_SEND_MESSAGE_FAIL:
             return "eSIR_SME_HAL_SEND_MESSAGE_FAIL";
-#else // GEN4_SCAN
-      case eSIR_SME_CHANNEL_SWITCH_DISABLED:
-            return "eSIR_SME_CHANNEL_SWITCH_DISABLED";
-      case eSIR_SME_HAL_SEND_MESSAGE_FAIL:
-            return "eSIR_SME_HAL_SEND_MESSAGE_FAIL";
-#endif // GEN4_SCAN
 
         default:
             return "INVALID resultCode";
@@ -4988,8 +4981,7 @@ limValidateDeltsReq(tpAniSirGlobal pMac, tpSirDeltsReq pDeltsReq, tSirMacAddr pe
     }
     else
     {
-      if((tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA) &&
-           psessionEntry->gLimEdcaParams[upToAc(tsinfo->traffic.userPrio)].aci.acm)
+      if(tsinfo->traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA)
       {
         //send message to HAL to delete TS
         if(eSIR_SUCCESS != limSendHalMsgDelTs(pMac,
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c
index effa37c1c8b3..97e2f6f7dda9 100644
--- a/CORE/SERVICES/HIF/PCIe/if_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/if_pci.c
@@ -256,6 +256,9 @@ hif_pci_device_reset(struct hif_pci_softc *sc)
     int i;
     u_int32_t val;
 
+    if (!sc->hostdef)
+        return;
+
     /* NB: Don't check resetok here.  This form of reset is integral to correct operation. */
 
     if (!SOC_GLOBAL_RESET_ADDRESS) {
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 388431dbd6ce..debf7eabfb68 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -4400,7 +4400,7 @@ static int wma_nan_rsp_event_handler(void *handle, u_int8_t *event_buf,
 	VOS_STATUS status;
 	vos_msg_t vos_msg;
 	u_int8_t *buf_ptr;
-	u_int8_t alloc_len;
+	u_int32_t alloc_len;
 
 	/*
 	 * This is how received event_buf looks like
@@ -4992,7 +4992,7 @@ static int wma_stats_ext_event_handler(void *handle, u_int8_t *event_buf,
 	VOS_STATUS status;
 	vos_msg_t vos_msg;
 	u_int8_t *buf_ptr;
-	u_int8_t alloc_len;
+	u_int32_t alloc_len;
 
 	WMA_LOGD("%s: Posting stats ext event to SME", __func__);
 
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 82a4ae120055..38160beb80a4 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -4293,9 +4293,6 @@ eCsrJoinState csrRoamJoin( tpAniSirGlobal pMac, tANI_U32 sessionId,
         else
         {
             // note:  we used to pre-auth here with open authentication networks but that was not working so well.
-            // we had a lot of join timeouts when testing at Samsung.  removing this step helped associations
-            // work much better.
-            //
             //
             // stop the existing network before attempting to join the new network...
                 if(!HAL_STATUS_SUCCESS(csrRoamStopNetwork(pMac, sessionId, pProfile, pBssDesc, pIesLocal)))