Merge "qcacmn: SmartMesh Extract status for radiotap headers"

dp/wifi3.0/dp_rx_err.c

@@ -212,11 +212,19 @@ dp_rx_chain_msdus(struct dp_soc *soc, qdf_nbuf_t nbuf,
 		struct dp_rx_desc *rx_desc)
 {
 	bool mpdu_done = false;
+	/* TODO: Currently only single radio is supported, hence
+	 * pdev hard coded to '0' index
+	 */
+	struct dp_pdev *dp_pdev = soc->pdev_list[0];
 
 	if (hal_rx_msdu_end_first_msdu_get(rx_desc->rx_buf_start)) {
 		qdf_nbuf_set_chfrag_start(rx_desc->nbuf, 1);
 		soc->invalid_peer_head_msdu = NULL;
 		soc->invalid_peer_tail_msdu = NULL;
+
+		hal_rx_mon_hw_desc_get_mpdu_status(rx_desc->rx_buf_start,
+				&(dp_pdev->ppdu_info.rx_status));
+
 	}
 
 	if (hal_rx_msdu_end_last_msdu_get(rx_desc->rx_buf_start)) {

os_if/linux/qca_vendor.h

@@ -2663,12 +2663,24 @@ enum qca_wlan_vendor_attr_nd_offload {
  *	user space wpa_supplicant do it. Information from received P2P
  *	Requests are forwarded from firmware to host whenever the APPS
  *	processor exits power collapse state.
+ * @QCA_WLAN_VENDOR_FEATURE_OCE_STA: Device supports all OCE non-AP STA
+ *	specific features
+ * @QCA_WLAN_VENDOR_FEATURE_OCE_AP: Device supports all OCE AP specific
+ *	features.
+ * @QCA_WLAN_VENDOR_FEATURE_OCE_STA_CFON: Device supports OCE STA-CFON
+ *	specific features only. If a Device sets this bit but not the
+ *	QCA_WLAN_VENDOR_FEATURE_OCE_AP, the userspace shall assume that
+ *	this Device may not support all OCE AP functionalities but can support
+ *	only OCE STA-CFON functionalities.
  */
 enum qca_wlan_vendor_features {
 	QCA_WLAN_VENDOR_FEATURE_KEY_MGMT_OFFLOAD = 0,
 	QCA_WLAN_VENDOR_FEATURE_SUPPORT_HW_MODE_ANY = 1,
 	QCA_WLAN_VENDOR_FEATURE_OFFCHANNEL_SIMULTANEOUS = 2,
 	QCA_WLAN_VENDOR_FEATURE_P2P_LISTEN_OFFLOAD	= 3,
+	QCA_WLAN_VENDOR_FEATURE_OCE_STA = 4,
+	QCA_WLAN_VENDOR_FEATURE_OCE_AP = 5,
+	QCA_WLAN_VENDOR_FEATURE_OCE_STA_CFON = 6,
 	/* Additional features need to be added above this */
 	NUM_QCA_WLAN_VENDOR_FEATURES
 };

wmi/inc/wmi_unified_api.h

@@ -34,7 +34,6 @@
 #define _WMI_UNIFIED_API_H_
 
 #include <osdep.h>
-#include "a_types.h"
 #ifdef CONFIG_MCL
 #include "wmi.h"
 #endif

wmi/inc/wmi_unified_priv.h

@@ -32,9 +32,12 @@
 #ifndef _WMI_UNIFIED_PRIV_H_
 #define _WMI_UNIFIED_PRIV_H_
 #include <osdep.h>
-#include "a_types.h"
+#include "wmi_unified_api.h"
 #include "wmi_unified_param.h"
 #include "wlan_scan_ucfg_api.h"
+#ifdef CONFIG_MCL
+#include <wmi_unified.h>
+#endif
 #include "qdf_atomic.h"
 #include "wlan_objmgr_psoc_service_ready_api.h"
 

wmi/src/wmi_tlv_platform.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -29,7 +29,6 @@
  * LMAC offload interface functions for WMI TLV Interface
  */
 
-#include "ol_if_athvar.h"
 #include <qdf_mem.h>         /* qdf_mem_malloc,free, etc. */
 #include <osdep.h>
 #include "htc_api.h"

wmi/src/wmi_unified.c

@@ -28,16 +28,9 @@
 /*
  * Host WMI unified implementation
  */
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "htc_api.h"
 #include "htc_api.h"
-#include "dbglog_host.h"
 #include "wmi_unified_priv.h"
-#include "wmi_unified_param.h"
 
 #ifndef WMI_NON_TLV_SUPPORT
 #include "wmi_tlv_helper.h"
@@ -1875,11 +1868,6 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 	return "Invalid WMI cmd";
 }
 
-static inline void wma_log_cmd_id(uint32_t cmd_id, uint32_t tag)
-{
-	WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d\n",
-		 wmi_id_to_name(cmd_id), cmd_id, tag);
-}
 #else
 static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 {
@@ -1888,6 +1876,12 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 #endif
 
 #ifdef CONFIG_MCL
+static inline void wmi_log_cmd_id(uint32_t cmd_id, uint32_t tag)
+{
+	WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d\n",
+		 wmi_id_to_name(cmd_id), cmd_id, tag);
+}
+
 /**
  * wmi_is_pm_resume_cmd() - check if a cmd is part of the resume sequence
  * @cmd_id: command to check
@@ -2001,7 +1995,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf);
 #ifdef CONFIG_MCL
-	wma_log_cmd_id(cmd_id, htc_tag);
+	wmi_log_cmd_id(cmd_id, htc_tag);
 #endif
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING

wmi/src/wmi_unified_api.c

@@ -24,11 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "wmi_unified_priv.h"
 #include "wmi_unified_param.h"
 

wmi/src/wmi_unified_non_tlv.c

@@ -25,14 +25,9 @@
  * to the Linux Foundation.
  */
 
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "wlan_defs.h"
-#include "ol_if_athvar.h"
 #include "wmi_unified_api.h"
 #include "wmi_unified_priv.h"
+#include "hif.h"
 
 #if defined(WMI_NON_TLV_SUPPORT) || defined(WMI_TLV_AND_NON_TLV_SUPPORT)
 #include "wmi.h"