Revert "[wpa_supplicant] Cumulative patch from b8491ae5a"

This reverts commit 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda.

Reason for revert: git_master/sdk_phone_armv7-sdk

Change-Id: I6070fc5c1f9c20867f6dfce90e529e35578d572e
diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h
index 0c607b8..c34a3bc 100644
--- a/src/common/qca-vendor.h
+++ b/src/common/qca-vendor.h
@@ -1,7 +1,7 @@
 /*
  * Qualcomm Atheros OUI and vendor specific assignments
  * Copyright (c) 2014-2017, Qualcomm Atheros, Inc.
- * Copyright (c) 2018-2019, The Linux Foundation
+ * Copyright (c) 2018, The Linux Foundation
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -98,9 +98,6 @@
  *	which supports DFS offloading, to indicate a radar pattern has been
  *	detected. The channel is now unusable.
  *
- * @QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_INFO: Get information from the driver.
- *	Attributes defined in enum qca_wlan_vendor_attr_get_wifi_info.
- *
  * @QCA_NL80211_VENDOR_SUBCMD_GET_LOGGER_FEATURE_SET: Get the feature bitmap
  *	based on enum wifi_logger_supported_features. Attributes defined in
  *	enum qca_wlan_vendor_attr_get_logger_features.
@@ -376,9 +373,7 @@
  * @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START: Start spectral scan. The scan
  *	parameters are specified by enum qca_wlan_vendor_attr_spectral_scan.
  *	This returns a cookie (%QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_COOKIE)
- *	identifying the operation in success case. In failure cases an
- *	error code (%QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_ERROR_CODE)
- *	describing the reason for the failure is returned.
+ *	identifying the operation in success case.
  *
  * @QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_STOP: Stop spectral scan. This uses
  *	a cookie (%QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_COOKIE) from
@@ -529,61 +524,6 @@
  *	parameters including Zigbee state and specific WLAN periods to enhance
  *	PTA master. All these parameters are delivered by the attributes
  *	defined in enum qca_mpta_helper_vendor_attr.
- * @QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING: This sub command is used to
- *	implement Beacon frame reporting feature.
- *
- *	Userspace can request the driver/firmware to periodically report
- *	received Beacon frames whose BSSID is same as the current connected
- *	BSS's MAC address.
- *
- *	In case the STA seamlessly (without sending disconnect indication to
- *	userspace) roams to a different BSS, Beacon frame reporting will be
- *	automatically enabled for the Beacon frames whose BSSID is same as the
- *	MAC address of the new BSS. Beacon reporting will be stopped when the
- *	STA is disconnected (when the disconnect indication is sent to
- *	userspace) and need to be explicitly enabled by userspace for next
- *	connection.
- *
- *	When a Beacon frame matching configured conditions is received, and if
- *	userspace has requested to send asynchronous beacon reports, the
- *	driver/firmware will encapsulate the details of the Beacon frame in an
- *	event and send it to userspace along with updating the BSS information
- *	in cfg80211 scan cache, otherwise driver will only update the cfg80211
- *	scan cache with the information from the received Beacon frame but will
- *	not send any active report to userspace.
- *
- *	The userspace can request the driver/firmware to stop reporting Beacon
- *	frames. If the driver/firmware is not able to receive Beacon frames due
- *	to other Wi-Fi operations such as off-channel activities, etc., the
- *	driver/firmware will send a pause event to userspace and stop reporting
- *	Beacon frames. Whether the beacon reporting will be automatically
- *	resumed or not by the driver/firmware later will be reported to
- *	userspace using the QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_AUTO_RESUMES
- *	flag. The beacon reporting shall be resumed for all the cases except
- *	either when userspace sets
- *	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_DO_NOT_RESUME flag in the command
- *	which triggered the current beacon reporting or during any disconnection
- *	case as indicated by setting
- *	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_PAUSE_REASON to
- *	QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_DISCONNECTED by the
- *	driver.
- *
- *	After QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_PAUSE event is received
- *	by userspace with QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_AUTO_RESUMES
- *	flag not set, the next first
- *	QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO event from the driver
- *	shall be considered as un-pause event.
- *
- *	All the attributes used with this command are defined in
- *	enum qca_wlan_vendor_attr_beacon_reporting_params.
- * @QCA_NL80211_VENDOR_SUBCMD_INTEROP_ISSUES_AP: In practice, some APs have
- *	interop issues with the DUT. This sub command is used to transfer the
- *	AP info between the driver and user space. This works both as a command
- *	and an event. As a command, it configures the stored list of APs from
- *	user space to firmware; as an event, it indicates the AP info detected
- *	by the firmware to user space for persistent storage. The attributes
- *	defined in enum qca_vendor_attr_interop_issues_ap are used to deliver
- *	the parameters.
  */
 enum qca_nl80211_vendor_subcmds {
 	QCA_NL80211_VENDOR_SUBCMD_UNSPEC = 0,
@@ -752,8 +692,6 @@
 	QCA_NL80211_VENDOR_SUBCMD_GET_FW_STATE = 177,
 	QCA_NL80211_VENDOR_SUBCMD_PEER_STATS_CACHE_FLUSH = 178,
 	QCA_NL80211_VENDOR_SUBCMD_MPTA_HELPER_CONFIG = 179,
-	QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING = 180,
-	QCA_NL80211_VENDOR_SUBCMD_INTEROP_ISSUES_AP = 181,
 };
 
 enum qca_wlan_vendor_attr {
@@ -3266,28 +3204,11 @@
 /**
  * enum qca_wlan_vendor_attr_get_wifi_info: Attributes for data used by
  * QCA_NL80211_VENDOR_SUBCMD_GET_WIFI_INFO sub command.
- *
- * @QCA_WLAN_VENDOR_ATTR_WIFI_INFO_DRIVER_VERSION: In a request this attribute
- *	should be set to any U8 value to indicate that the driver version
- *	should be returned. When enabled in this manner, in a response this
- *	attribute will contain a string representation of the driver version.
- *
- * @QCA_WLAN_VENDOR_ATTR_WIFI_INFO_FIRMWARE_VERSION: In a request this attribute
- *	should be set to any U8 value to indicate that the firmware version
- *	should be returned. When enabled in this manner, in a response this
- *	attribute will contain a string representation of the firmware version.
- *
- * @QCA_WLAN_VENDOR_ATTR_WIFI_INFO_RADIO_INDEX: In a request this attribute
- *	should be set to any U32 value to indicate that the current radio
- *	index should be returned. When enabled in this manner, in a response
- *	this attribute will contain a U32 radio index value.
- *
  */
 enum qca_wlan_vendor_attr_get_wifi_info {
 	QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_INVALID = 0,
 	QCA_WLAN_VENDOR_ATTR_WIFI_INFO_DRIVER_VERSION = 1,
 	QCA_WLAN_VENDOR_ATTR_WIFI_INFO_FIRMWARE_VERSION = 2,
-	QCA_WLAN_VENDOR_ATTR_WIFI_INFO_RADIO_INDEX = 3,
 
 	/* keep last */
 	QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_AFTER_LAST,
@@ -4560,44 +4481,6 @@
 	 * qca_wlan_vendor_attr_spectral_scan_request_type.
 	 */
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_REQUEST_TYPE = 23,
-	/* This specifies the frequency span over which spectral
-	 * scan would be carried out. Its value depends on the
-	 * value of QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_MODE and
-	 * the relation is as follows.
-	 * QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_NORMAL
-	 *    Not applicable. Spectral scan would happen in the
-	 *    operating span.
-	 * QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_AGILE
-	 *    Center frequency (in MHz) of the span of interest or
-	 *    for convenience, center frequency (in MHz) of any channel
-	 *    in the span of interest. If agile spectral scan is initiated
-	 *    without setting a valid frequency it returns the error code
-	 *    (QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_NOT_INITIALIZED).
-	 * u32 attribute.
-	 */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_FREQUENCY = 24,
-	/* Spectral scan mode. u32 attribute.
-	 * It uses values defined in enum qca_wlan_vendor_spectral_scan_mode.
-	 * If this attribute is not present, it is assumed to be
-	 * normal mode (QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_NORMAL).
-	 */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_MODE = 25,
-	/* Spectral scan error code. u32 attribute.
-	 * It uses values defined in enum
-	 * qca_wlan_vendor_spectral_scan_error_code.
-	 * This attribute is included only in failure scenarios.
-	 */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_ERROR_CODE = 26,
-	/* 8-bit unsigned value to enable/disable debug of the
-	 * Spectral DMA ring.
-	 * 1-enable, 0-disable
-	 */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_DMA_RING_DEBUG = 27,
-	/* 8-bit unsigned value to enable/disable debug of the
-	 * Spectral DMA buffers.
-	 * 1-enable, 0-disable
-	 */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_DMA_BUFFER_DEBUG = 28,
 
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_AFTER_LAST,
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CONFIG_MAX =
@@ -4676,8 +4559,6 @@
 	 * u8 attribute.
 	 */
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CAP_DEFAULT_AGC_MAX_GAIN = 10,
-	/* Flag attribute to indicate agile spectral scan capability */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CAP_AGILE_SPECTRAL = 11,
 
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CAP_AFTER_LAST,
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CAP_MAX =
@@ -4694,13 +4575,6 @@
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_STATUS_IS_ENABLED = 1,
 	/* Flag attribute to indicate whether spectral scan is in progress*/
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_STATUS_IS_ACTIVE = 2,
-	/* Spectral scan mode. u32 attribute.
-	 * It uses values defined in enum qca_wlan_vendor_spectral_scan_mode.
-	 * If this attribute is not present, normal mode
-	 * (QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_NORMAL is assumed to be
-	 * requested.
-	 */
-	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_STATUS_MODE = 3,
 
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_STATUS_AFTER_LAST,
 	QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_STATUS_MAX =
@@ -4726,43 +4600,6 @@
 };
 
 /**
- * qca_wlan_vendor_spectral_scan_mode: Attribute values for
- * QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_MODE in the vendor subcmd
- * QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START and
- * QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_STATUS_MODE in the vendor subcmd
- * QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_GET_STATUS. This represents the
- * spectral scan modes.
- * @QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_NORMAL: Normal spectral scan:
- * spectral scan in the current operating span.
- * @QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_AGILE: Agile spectral scan:
- * spectral scan in the configured agile span.
- */
-enum qca_wlan_vendor_spectral_scan_mode {
-	QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_NORMAL = 0,
-	QCA_WLAN_VENDOR_SPECTRAL_SCAN_MODE_AGILE = 1,
-};
-
-/**
- * qca_wlan_vendor_spectral_scan_error_code: Attribute values for
- * QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_ERROR_CODE in the vendor subcmd
- * QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_START.
- * @QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_UNSUPPORTED: Changing the value
- * of a parameter is not supported.
- * @QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_MODE_UNSUPPORTED: Requested spectral scan
- * mode is not supported.
- * @QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_INVALID_VALUE: A parameter
- * has invalid value.
- * @QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_NOT_INITIALIZED: A parameter
- * is not initialized.
- */
-enum qca_wlan_vendor_spectral_scan_error_code {
-	QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_UNSUPPORTED = 0,
-	QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_MODE_UNSUPPORTED = 1,
-	QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_INVALID_VALUE = 2,
-	QCA_WLAN_VENDOR_SPECTRAL_SCAN_ERR_PARAM_NOT_INITIALIZED = 3,
-};
-
-/**
  * qca_wlan_vendor_spectral_scan_cap_hw_gen: Attribute values for
  * QCA_WLAN_VENDOR_ATTR_SPECTRAL_SCAN_CAP_HW_GEN to the vendor subcmd
  * QCA_NL80211_VENDOR_SUBCMD_SPECTRAL_SCAN_GET_CAP_INFO. This represents the
@@ -6872,234 +6709,4 @@
 		QCA_MPTA_HELPER_VENDOR_ATTR_AFTER_LAST - 1
 };
 
-/**
- * enum qca_wlan_vendor_beacon_reporting_op_types - Defines different types of
- * operations for which %QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING can be used.
- * Will be used by %QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE.
- *
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START: Sent by userspace to the driver
- * to request the driver to start reporting Beacon frames.
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_OP_STOP: Sent by userspace to the driver to
- * request the driver to stop reporting Beacon frames.
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO: Sent by the driver to
- * userspace to report received Beacon frames.
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_OP_PAUSE: Sent by the driver to userspace
- * to indicate that the driver is going to pause reporting Beacon frames.
- */
-enum qca_wlan_vendor_beacon_reporting_op_types {
-	QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START = 0,
-	QCA_WLAN_VENDOR_BEACON_REPORTING_OP_STOP = 1,
-	QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO = 2,
-	QCA_WLAN_VENDOR_BEACON_REPORTING_OP_PAUSE = 3,
-};
-
-/**
- * enum qca_wlan_vendor_beacon_reporting_pause_reasons - Defines different types
- * of reasons for which the driver is pausing reporting Beacon frames. Will be
- * used by %QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_PAUSE_REASON.
- *
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_UNSPECIFIED: For unspecified
- * reasons.
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_SCAN_STARTED: When the
- * driver/firmware is starting a scan.
- * @QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_DISCONNECTED: When the
- * driver/firmware disconnects from the ESS and indicates the disconnection to
- * userspace (non-seamless roaming case). This reason code will be used by the
- * driver/firmware to indicate stopping of beacon report events. Userspace will
- * need to start beacon reporting again (if desired) by sending vendor command
- * QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING with
- * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE set to
- * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START after the next connection is
- * completed.
- */
-enum qca_wlan_vendor_beacon_reporting_pause_reasons {
-	QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_UNSPECIFIED = 0,
-	QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_SCAN_STARTED = 1,
-	QCA_WLAN_VENDOR_BEACON_REPORTING_PAUSE_REASON_DISCONNECTED = 2,
-};
-
-/*
- * enum qca_wlan_vendor_attr_beacon_reporting_params - List of attributes used
- * in vendor sub-command QCA_NL80211_VENDOR_SUBCMD_BEACON_REPORTING.
- */
-enum qca_wlan_vendor_attr_beacon_reporting_params {
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_INVALID = 0,
-	/* Specifies the type of operation that the vendor command/event is
-	 * intended for. Possible values for this attribute are defined in
-	 * enum qca_wlan_vendor_beacon_reporting_op_types. u32 attribute.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE = 1,
-	/* Optionally set by userspace to request the driver to report Beacon
-	 * frames using asynchronous vendor events when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START. NLA_FLAG attribute.
-	 * If this flag is not set, the driver will only update Beacon frames in
-	 * cfg80211 scan cache but not send any vendor events.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_ACTIVE_REPORTING = 2,
-	/* Optionally used by userspace to request the driver/firmware to report
-	 * Beacon frames periodically when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START.
-	 * u32 attribute, indicates the period of Beacon frames to be reported
-	 * and in the units of beacon interval.
-	 * If this attribute is missing in the command, then the default value
-	 * of 1 will be assumed by driver, i.e., to report every Beacon frame.
-	 * Zero is an invalid value.
-	 * If a valid value is received for this attribute, the driver will
-	 * update the cfg80211 scan cache periodically as per the value received
-	 * in this attribute in addition to updating the cfg80211 scan cache
-	 * when there is significant change in Beacon frame IEs.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_PERIOD = 3,
-	/* Used by the driver to encapsulate the SSID when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO.
-	 * u8 array with a maximum size of 32.
-	 *
-	 * When generating beacon report from non-MBSSID Beacon frame, the SSID
-	 * will be taken from the SSID element of the received Beacon frame.
-	 *
-	 * When generating beacon report from Multiple BSSID Beacon frame and if
-	 * the BSSID of the current connected BSS matches the BSSID of the
-	 * transmitting BSS, the SSID will be taken from the SSID element of the
-	 * received Beacon frame.
-	 *
-	 * When generating beacon report from Multiple BSSID Beacon frame and if
-	 * the BSSID of the current connected BSS matches the BSSID of one of
-	 * the* nontransmitting BSSs, the SSID will be taken from the SSID field
-	 * included in the nontransmitted BSS profile whose derived BSSID is
-	 * same as the BSSID of the current connected BSS. When there is no
-	 * nontransmitted BSS profile whose derived BSSID is same as the BSSID
-	 * of current connected* BSS, this attribute will not be present.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_SSID = 4,
-	/* Used by the driver to encapsulate the BSSID of the AP to which STA is
-	 * currently connected to when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO. u8 array with a
-	 * fixed size of 6 bytes.
-	 *
-	 * When generating beacon report from a Multiple BSSID beacon and the
-	 * current connected BSSID matches one of the nontransmitted BSSIDs in a
-	 * Multiple BSSID set, this BSSID will be that particular nontransmitted
-	 * BSSID and not the transmitted BSSID (i.e., the transmitting address
-	 * of the Beacon frame).
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_BSSID = 5,
-	/* Used by the driver to encapsulate the frequency in MHz on which
-	 * the Beacon frame was received when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is
-	 * set to QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO.
-	 * u32 attribute.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_FREQ = 6,
-	/* Used by the driver to encapsulate the Beacon interval
-	 * when the QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO.
-	 * u16 attribute. The value will be copied from the Beacon frame and the
-	 * units are TUs.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_BI = 7,
-	/* Used by the driver to encapsulate the Timestamp field from the Beacon
-	 * frame when the QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set
-	 * to QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO.
-	 * u64 attribute.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_TSF = 8,
-	/* Used by the driver to encapsulate the CLOCK_BOOTTIME when this
-	 * Beacon frame is received in the driver when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO. u64 attribute, in
-	 * the units of nanoseconds. This value is expected to have accuracy of
-	 * about 10 ms.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_BOOTTIME_WHEN_RECEIVED = 9,
-	/* Used by the driver to encapsulate the IEs of the Beacon frame from
-	 * which this event is generated when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_BEACON_INFO. u8 array.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_IES = 10,
-	/* Used by the driver to specify the reason for the driver/firmware to
-	 * pause sending beacons to userspace when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_PAUSE. Possible values are
-	 * defined in enum qca_wlan_vendor_beacon_reporting_pause_reasons, u32
-	 * attribute.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_PAUSE_REASON = 11,
-	/* Used by the driver to specify whether the driver will automatically
-	 * resume reporting beacon events to userspace later (for example after
-	 * the ongoing off-channel activity is completed etc.) when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_PAUSE. NLA_FLAG attribute.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_AUTO_RESUMES = 12,
-	/* Optionally set by userspace to request the driver not to resume
-	 * beacon reporting after a pause is completed, when the
-	 * QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_OP_TYPE is set to
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START. NLA_FLAG attribute.
-	 * If this flag is set, the driver will not resume beacon reporting
-	 * after any pause in beacon reporting is completed. Userspace has to
-	 * send QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START command again in order
-	 * to initiate beacon reporting again. If this flag is set in the recent
-	 * QCA_WLAN_VENDOR_BEACON_REPORTING_OP_START command, then in the
-	 * subsequent QCA_WLAN_VENDOR_BEACON_REPORTING_OP_PAUSE event (if any)
-	 * the QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_AUTO_RESUMES shall not be
-	 * set by the driver. Setting this flag until and unless there is a
-	 * specific need is not recommended as there is a chance of some beacons
-	 * received after pause command and next start command being not
-	 * reported.
-	 */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_DO_NOT_RESUME = 13,
-
-	/* Keep last */
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_LAST,
-	QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_MAX =
-		QCA_WLAN_VENDOR_ATTR_BEACON_REPORTING_LAST - 1
-};
-
-/**
- * enum qca_vendor_interop_issues_ap_type - Interop issue types
- * This enum defines the valid set of values of interop issue types. These
- * values are used by attribute %QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_TYPE.
- *
- * @QCA_VENDOR_INTEROP_ISSUES_AP_ON_STA_PS: The AP has power save interop issue
- * when the STA's Qpower feature is enabled.
- */
-enum qca_vendor_interop_issues_ap_type {
-	QCA_VENDOR_INTEROP_ISSUES_AP_INVALID = 0,
-	QCA_VENDOR_INTEROP_ISSUES_AP_ON_STA_PS = 1,
-};
-
-/**
- * enum qca_vendor_attr_interop_issues_ap - attribute for AP with interop issues
- * Values are used by %QCA_NL80211_VENDOR_SUBCMD_INTEROP_ISSUES_AP.
- *
- * @QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_INVALID: Invalid value
- * @QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_TYPE: Interop issue type
- * 32-bit unsigned value. The values defined in enum
- * qca_vendor_interop_issues_ap_type are used.
- * @QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_LIST: APs' BSSID container
- * array of nested QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID attributes.
- * It is present and mandatory for the command but is not used for the event
- * since only a single BSSID is reported in an event.
- * @QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID: AP's BSSID 6-byte MAC address.
- * It is used within the nested QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_LIST
- * attribute in command case and without such encapsulation in the event case.
- * @QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_AFTER_LAST: last value
- * @QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_MAX: max value
- */
-enum qca_vendor_attr_interop_issues_ap {
-	QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_INVALID,
-	QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_TYPE,
-	QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_LIST,
-	QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_BSSID,
-	/* keep last */
-	QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_AFTER_LAST,
-	QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_MAX =
-		QCA_WLAN_VENDOR_ATTR_INTEROP_ISSUES_AP_AFTER_LAST - 1
-};
-
 #endif /* QCA_VENDOR_H */