diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-08 16:03:46 -0800 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-11-09 14:40:17 -0800 |
commit | 34ba91307bd2a2549b1417d680e54fe5317939cf (patch) | |
tree | 8c664efe1c93121f4bed492d9001e9b40339f7ca /qcwcn/wifi_hal | |
parent | 8696050441dbc5a5a756e77dae8ca4c1484ee6fb (diff) | |
download | wlan-34ba91307bd2a2549b1417d680e54fe5317939cf.tar.gz |
wlan: Remove qca_wlan_vendor_attr_ll_stats_xxx and add qca-vendor.h include
New wpa_supplicant qca-vendor.h has all these definitions:
enum qca_wlan_vendor_attr_ll_stats_set
enum qca_wlan_vendor_attr_ll_stats_clr
enum qca_wlan_vendor_attr_ll_stats_get
enum qca_wlan_vendor_attr_ll_stats_results
enum qca_wlan_vendor_attr_ll_stats_type
Test: manual
Change-Id: Ie2e65d105c4b5117b1e09f8bba93d768655d9b9c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'qcwcn/wifi_hal')
-rw-r--r-- | qcwcn/wifi_hal/llstatscommand.h | 1 | ||||
-rw-r--r-- | qcwcn/wifi_hal/vendor_definitions.h | 356 |
2 files changed, 1 insertions, 356 deletions
diff --git a/qcwcn/wifi_hal/llstatscommand.h b/qcwcn/wifi_hal/llstatscommand.h index b45deb7..ae75b54 100644 --- a/qcwcn/wifi_hal/llstatscommand.h +++ b/qcwcn/wifi_hal/llstatscommand.h @@ -37,6 +37,7 @@ #include "nl80211_copy.h" #include "common.h" +#include "qca-vendor.h" #include "cpp_bindings.h" #include "link_layer_stats.h" diff --git a/qcwcn/wifi_hal/vendor_definitions.h b/qcwcn/wifi_hal/vendor_definitions.h index e9180a1..833e148 100644 --- a/qcwcn/wifi_hal/vendor_definitions.h +++ b/qcwcn/wifi_hal/vendor_definitions.h @@ -106,362 +106,6 @@ #define QCA_NL80211_VENDOR_SUBCMD_GET_WAKE_REASON_STATS 85 #endif -enum qca_wlan_vendor_attr_ll_stats_set -{ - QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_INVALID = 0, - /* Unsigned 32-bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_MPDU_SIZE_THRESHOLD = 1, - QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_AGGRESSIVE_STATS_GATHERING, - /* keep last */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_AFTER_LAST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_MAX = - QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_AFTER_LAST - 1, -}; - -enum qca_wlan_vendor_attr_ll_stats_clr -{ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_INVALID = 0, - /* Unsigned 32bit bitmap for clearing statistics - * All radio statistics 0x00000001 - * cca_busy_time (within radio statistics) 0x00000002 - * All channel stats (within radio statistics) 0x00000004 - * All scan statistics (within radio statistics) 0x00000008 - * All interface statistics 0x00000010 - * All tx rate statistics (within interface statistics) 0x00000020 - * All ac statistics (with in interface statistics) 0x00000040 - * All contention (min, max, avg) statistics (within ac statisctics) - * 0x00000080. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_REQ_MASK, - /* Unsigned 8bit value : Request to stop statistics collection */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_STOP_REQ, - - /* Unsigned 32bit bitmap : Response from the driver - * for the cleared statistics - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_RSP_MASK, - /* Unsigned 8bit value: Response from driver/firmware - * for the stop request - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_STOP_RSP, - /* keep last */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_AFTER_LAST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_MAX = - QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_AFTER_LAST - 1, -}; - -enum qca_wlan_vendor_attr_ll_stats_get -{ - QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_INVALID = 0, - /* Unsigned 32bit value provided by the caller issuing the GET stats - * command. When reporting the stats results, the driver uses the same - * value to indicate which GET request the results correspond to. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_ID, - /* Unsigned 32bit value - bit mask to identify what statistics are - * requested for retrieval. - * Radio Statistics 0x00000001 - * Interface Statistics 0x00000020 - * All Peer Statistics 0x00000040 - * Peer Statistics 0x00000080 - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_MASK, - /* keep last */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_AFTER_LAST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_MAX = - QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_AFTER_LAST - 1, -}; - -enum qca_wlan_vendor_attr_ll_stats_results -{ - QCA_WLAN_VENDOR_ATTR_LL_STATS_INVALID = 0, - /* Unsigned 32bit value. Used by the driver; must match the request id - * provided with the QCA_NL80211_VENDOR_SUBCMD_LL_STATS_GET command. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RESULTS_REQ_ID, - - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_BEACON_RX, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_RX, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_ACTION_RX, - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_MGMT_ACTION_TX, - /* Signed 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_MGMT, - /* Signed 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_DATA, - /* Signed 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_RSSI_ACK, - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_* are - * nested within the interface stats. - */ - - /* Interface mode, e.g., STA, SOFTAP, IBSS, etc. - * Type = enum wifi_interface_mode. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MODE, - /* Interface MAC address. An array of 6 Unsigned int8 */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MAC_ADDR, - /* Type = enum wifi_connection_state, e.g., DISCONNECTED, - * AUTHENTICATING, etc. valid for STA, CLI only. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_STATE, - /* Type = enum wifi_roam_state. Roaming state, e.g., IDLE or ACTIVE - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_ROAMING, - /* Unsigned 32bit value. WIFI_CAPABILITY_XXX */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_CAPABILITIES, - /* NULL terminated SSID. An array of 33 Unsigned 8bit values */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_SSID, - /* BSSID. An array of 6 Unsigned 8bit values */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_BSSID, - /* Country string advertised by AP. An array of 3 Unsigned 8bit - * values. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_AP_COUNTRY_STR, - /* Country string for this association. An array of 3 Unsigned 8bit - * values. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_COUNTRY_STR, - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_* could - * be nested within the interface stats. - */ - - /* Type = enum wifi_traffic_ac, e.g., V0, VI, BE and BK */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_AC, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_MPDU, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_MPDU, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_MCAST, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_MCAST, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RX_AMPDU, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_TX_AMPDU, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_MPDU_LOST, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES, - /* Unsigned int 32 value corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES_SHORT, - /* Unsigned int 32 values corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_RETRIES_LONG, - /* Unsigned int 32 values corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_MIN, - /* Unsigned int 32 values corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_MAX, - /* Unsigned int 32 values corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_TIME_AVG, - /* Unsigned int 32 values corresponding to respective AC */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_NUM_SAMPLES, - /* Unsigned 32bit value. Number of peers */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NUM_PEERS, - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_* are - * nested within the interface stats. - */ - - /* Type = enum wifi_peer_type. Peer type, e.g., STA, AP, P2P GO etc. */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_TYPE, - /* MAC addr corresponding to respective peer. An array of 6 Unsigned - * 8bit values. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_MAC_ADDRESS, - /* Unsigned int 32bit value representing capabilities corresponding - * to respective peer. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_CAPABILITIES, - /* Unsigned 32bit value. Number of rates */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_NUM_RATES, - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_* - * are nested within the rate stat. - */ - - /* Wi-Fi Rate - separate attributes defined for individual fields */ - - /* Unsigned int 8bit value; 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_PREAMBLE, - /* Unsigned int 8bit value; 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_NSS, - /* Unsigned int 8bit value; 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_BW, - /* Unsigned int 8bit value; OFDM/CCK rate code would be as per IEEE Std - * in the units of 0.5mbps HT/VHT it would be mcs index */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_MCS_INDEX, - - /* Unsigned 32bit value. Bit rate in units of 100Kbps */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_BIT_RATE, - - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_STAT_* could be - * nested within the peer info stats. - */ - - /* Unsigned int 32bit value. Number of successfully transmitted data pkts, - * i.e., with ACK received corresponding to the respective rate. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_TX_MPDU, - /* Unsigned int 32bit value. Number of received data pkts corresponding - * to the respective rate. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RX_MPDU, - /* Unsigned int 32bit value. Number of data pkts losses, i.e., no ACK - * received corresponding to *the respective rate. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_MPDU_LOST, - /* Unsigned int 32bit value. Total number of data pkt retries for the - * respective rate. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES, - /* Unsigned int 32bit value. Total number of short data pkt retries - * for the respective rate. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_SHORT, - /* Unsigned int 32bit value. Total number of long data pkt retries - * for the respective rate. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_LONG, - - - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ID, - /* Unsigned 32bit value. Total number of msecs the radio is awake - * accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME, - /* Unsigned 32bit value. Total number of msecs the radio is transmitting - * accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME, - /* Unsigned 32bit value. Total number of msecs the radio is in active - * receive accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_RX_TIME, - /* Unsigned 32bit value. Total number of msecs the radio is awake due - * to all scan accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_SCAN, - /* Unsigned 32bit value. Total number of msecs the radio is awake due - * to NAN accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_NBD, - /* Unsigned 32bit value. Total number of msecs the radio is awake due - * to GSCAN accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_GSCAN, - /* Unsigned 32bit value. Total number of msecs the radio is awake due - * to roam scan accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_ROAM_SCAN, - /* Unsigned 32bit value. Total number of msecs the radio is awake due - * to PNO scan accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_PNO_SCAN, - /* Unsigned 32bit value. Total number of msecs the radio is awake due - * to HS2.0 scans and GAS *exchange accruing over time. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_ON_TIME_HS20, - /* Unsigned 32bit value. Number of channels. */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_CHANNELS, - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_* could - * be nested within the channel stats. - */ - - /* Type = enum wifi_channel_width. Channel width, e.g., 20, 40, 80 */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_WIDTH, - /* Unsigned 32bit value. Primary 20MHz channel. */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ, - /* Unsigned 32bit value. Center frequency (MHz) first segment. */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ0, - /* Unsigned 32bit value. Center frequency (MHz) second segment. */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_CENTER_FREQ1, - - /* Attributes of type QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_* could be - * nested within the radio stats. - */ - - /* Unsigned int 32bit value representing total number of msecs the radio - * is awake on that *channel accruing over time, corresponding to the - * respective channel. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_ON_TIME, - /* Unsigned int 32bit value representing total number of msecs the CCA - * register is busy accruing *over time corresponding to the respective - * channel. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_CCA_BUSY_TIME, - - QCA_WLAN_VENDOR_ATTR_LL_STATS_NUM_RADIOS, - - /* Signifies the nested list of channel attributes - * QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_INFO_* - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_CH_INFO, - - /* Signifies the nested list of peer info attributes - * QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_* - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO, - - /* Signifies the nested list of rate info attributes - * QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_* - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_RATE_INFO, - - /* Signifies the nested list of wmm info attributes - * QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_* - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_INFO, - - /* Unsigned 8bit value. Used by the driver; if set to 1, it indicates that - * more stats, e.g., peers or radio, are to follow in the next - * QCA_NL80211_VENDOR_SUBCMD_LL_STATS_*_RESULTS event. - * Otherwise, it is set to 0. - */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RESULTS_MORE_DATA, - - /* Unsigned 64bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_AVERAGE_TSF_OFFSET, - - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_DETECTED, - - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_AVG_NUM_FRAMES_LEAKED, - - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_LEAKY_AP_GUARD_TIME, - - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_TYPE, - - /* Unsigned 32bit value */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_TX_LEVELS, - - /* Number of msecs the radio spent in transmitting for each power level */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_TX_TIME_PER_LEVEL, - - /* keep last */ - QCA_WLAN_VENDOR_ATTR_LL_STATS_AFTER_LAST, - QCA_WLAN_VENDOR_ATTR_LL_STATS_MAX = QCA_WLAN_VENDOR_ATTR_LL_STATS_AFTER_LAST - 1, -}; - -enum qca_wlan_vendor_attr_ll_stats_type -{ - QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_INVALID = 0, - QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_RADIO, - QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_IFACE, - QCA_NL80211_VENDOR_SUBCMD_LL_STATS_TYPE_PEERS -}; - enum qca_wlan_vendor_attr_gscan_config_params { QCA_WLAN_VENDOR_ATTR_GSCAN_SUBCMD_CONFIG_PARAM_INVALID = 0, |