Merge "Release 1.0.0.76 QCACLD WLAN Driver"

6 files changed, 23 insertions, 16 deletions

diff --git a/CORE/CLD_TXRX/TLSHIM/tl_shim.c b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
index 953b349a6d12..44c4604f643c 100644
--- a/CORE/CLD_TXRX/TLSHIM/tl_shim.c
+++ b/CORE/CLD_TXRX/TLSHIM/tl_shim.c
@@ -982,7 +982,7 @@ adf_nbuf_t WLANTL_SendSTA_DataFrame(void *vos_ctx, u_int8_t sta_id,
 			((pVosContextType) vos_ctx)->pdev_txrx_ctx,
 			sta_id);
 	if (!peer) {
-		TLSHIM_LOGE("Invalid peer");
+		TLSHIM_LOGW("Invalid peer");
 		return skb;
 	}
 
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 78327e46fe20..6554e5c67cf2 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -41,10 +41,10 @@ BRIEF DESCRIPTION:
 #define QWLAN_VERSION_MAJOR            1
 #define QWLAN_VERSION_MINOR            0
 #define QWLAN_VERSION_PATCH            0
-#define QWLAN_VERSION_EXTRA            "A"
-#define QWLAN_VERSION_BUILD            75
+#define QWLAN_VERSION_EXTRA            ""
+#define QWLAN_VERSION_BUILD            76
 
-#define QWLAN_VERSIONSTR               "1.0.0.75A"
+#define QWLAN_VERSIONSTR               "1.0.0.76"
 
 #ifdef QCA_WIFI_2_0
 
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index eb0a5fe97aa2..147dba10fb8e 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -66,9 +66,7 @@
 #ifdef ANI_OS_TYPE_QNX
 #include "stdio.h"
 #endif
-#ifdef FEATURE_WLAN_CH_AVOID
 #include "wlan_hdd_main.h"
-#endif /* FEATURE_WLAN_CH_AVOID */
 
 /*--------------------------------------------------------------------------
   Function definitions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 6d0cd72d8261..3ac5c64d21c9 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -6730,6 +6730,12 @@ static int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma,
 		default:
 			break;
 	}
+
+#ifdef FEATURE_WLAN_TDLS
+	if (STA_ENTRY_TDLS_PEER == params->staType)
+		cmd->peer_flags |= WMI_PEER_AUTH;
+#endif
+
 	if (params->wpa_rsn
 #ifdef FEATURE_WLAN_WAPI
 	    || params->encryptType == eSIR_ED_WPI
@@ -12973,6 +12979,12 @@ int wma_disable_wow_in_fw(WMA_HANDLE handle)
 	}
 
 	WMA_LOGD("WoW Resume in PCIe Context\n");
+
+	ret = wma_send_host_wakeup_ind_to_fw(wma);
+
+	if (ret != VOS_STATUS_SUCCESS)
+		return ret;
+
 	wma->wow.wow_enable = FALSE;
 	wma->wow.wow_enable_cmd_sent = FALSE;
 
@@ -12992,7 +13004,6 @@ int wma_disable_wow_in_fw(WMA_HANDLE handle)
 		iface->conn_state = FALSE;
 	}
 
-	ret = wma_send_host_wakeup_ind_to_fw(wma);
 	vos_wake_lock_timeout_acquire(&wma->wow_wake_lock, 2000);
 
 	return ret;
@@ -13461,7 +13472,7 @@ static void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg)
 	cmd->vdev_id = msg->sessionId;
 	cmd->ac = TID_TO_WME_AC(msg->tspec.tsinfo.traffic.userPrio);
 	cmd->medium_time_us = msg->tspec.mediumTime * 32;
-	cmd->downgrade_type = WMM_AC_DOWNGRADE_DEPRIO;
+	cmd->downgrade_type = WMM_AC_DOWNGRADE_DROP;
 	WMA_LOGD("Addts vdev:%d, ac:%d, mediumTime:%d, %s:%d",
 			cmd->vdev_id, cmd->ac, cmd->medium_time_us, __func__, __LINE__);
 	if (wmi_unified_cmd_send(wma->wmi_handle, buf, len,
diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index bf1a2c4d42da..6ec4fd345b65 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -593,9 +593,9 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len,
 			get_wmi_cmd_string(cmd_id), cmd_id);
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	adf_os_spin_lock_bh(&wmi_handle->wmi_cmd_record_lock);
+	adf_os_spin_lock_bh(&wmi_handle->wmi_record_lock);
 	WMI_COMMAND_RECORD(cmd_id);
-	adf_os_spin_unlock_bh(&wmi_handle->wmi_cmd_record_lock);
+	adf_os_spin_unlock_bh(&wmi_handle->wmi_record_lock);
 #endif
 
 	status = HTCSendPkt(wmi_handle->htc_handle, pkt);
@@ -765,9 +765,9 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf)
 		}
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-		adf_os_spin_lock_bh(&wmi_handle->wmi_event_record_lock);
+		adf_os_spin_lock_bh(&wmi_handle->wmi_record_lock);
 		WMI_EVENT_RECORD(id);
-		adf_os_spin_unlock_bh(&wmi_handle->wmi_event_record_lock);
+		adf_os_spin_unlock_bh(&wmi_handle->wmi_record_lock);
 #endif
 		/* Call the WMI registered event handler */
 		wmi_handle->event_handler[idx](wmi_handle->scn_handle,
@@ -833,8 +833,7 @@ wmi_unified_attach(ol_scn_t scn_handle)
     INIT_WORK(&wmi_handle->rx_event_work, wmi_rx_event_work);
 #endif
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-    adf_os_spinlock_init(&wmi_handle->wmi_cmd_record_lock);
-    adf_os_spinlock_init(&wmi_handle->wmi_event_record_lock);
+    adf_os_spinlock_init(&wmi_handle->wmi_record_lock);
 #endif
     return wmi_handle;
 }
diff --git a/CORE/SERVICES/WMI/wmi_unified_priv.h b/CORE/SERVICES/WMI/wmi_unified_priv.h
index 9880519a6b9d..a08dcaaa460e 100644
--- a/CORE/SERVICES/WMI/wmi_unified_priv.h
+++ b/CORE/SERVICES/WMI/wmi_unified_priv.h
@@ -86,8 +86,7 @@ struct wmi_unified {
 #endif /* WLAN_OPEN_SOURCE */
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	adf_os_spinlock_t wmi_cmd_record_lock;
-	adf_os_spinlock_t wmi_event_record_lock;
+	adf_os_spinlock_t wmi_record_lock;
 #endif /*WMI_INTERFACE_EVENT_LOGGING*/
 
 };