From a83c716d5f40dccc1ffad9110632da703e5aa1ad Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 17 May 2018 09:56:57 -0700 Subject: [PATCH 1/3] qcacmn: Revert to old API signature for WIFI_POS component Legacy User space application for wifi pos component uses old API signature hence using new signature breaks the legacy interfac between user space application and host driver. Revert to old signature to fix the interface. Change-Id: Idc55ecba23a8ac6263dd82fa9fb3650784db67f6 CRs-Fixed: 2244016 --- umac/wifi_pos/src/wifi_pos_utils_i.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/umac/wifi_pos/src/wifi_pos_utils_i.h b/umac/wifi_pos/src/wifi_pos_utils_i.h index 159512a73239..467573eb69a7 100644 --- a/umac/wifi_pos/src/wifi_pos_utils_i.h +++ b/umac/wifi_pos/src/wifi_pos_utils_i.h @@ -51,10 +51,10 @@ struct wifi_pos_req_msg; wifi_pos_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) #define OEM_APP_SIGNATURE_LEN 16 -#define OEM_APP_SIGNATURE_STR "QTI-OEM-APP" +#define OEM_APP_SIGNATURE_STR "QUALCOMM-OEM-APP" #define OEM_TARGET_SIGNATURE_LEN 8 -#define OEM_TARGET_SIGNATURE "QTI" +#define OEM_TARGET_SIGNATURE "QUALCOMM" #define OEM_CAP_MAX_NUM_CHANNELS 128 @@ -130,7 +130,7 @@ struct qdf_packed wifi_pos_driver_version { /** * struct wifi_pos_driver_caps - OEM Data Capabilities - * @oem_target_signature: Signature of chipset vendor, e.g. QTI + * @oem_target_signature: Signature of chipset vendor, e.g. QUALCOMM * @oem_target_type: Chip type * @oem_fw_version: Firmware version * @driver_version: Host software version @@ -157,8 +157,8 @@ struct qdf_packed wifi_pos_driver_caps { }; /** - * struct wifi_pos_user_defined_caps - OEM capability to be exchanged between host - * and userspace + * struct wifi_pos_user_defined_caps - OEM capability to be exchanged between + * host and userspace * @ftm_rr: FTM range report capability bit * @lci_capability: LCI capability bit * @reserved1: reserved From 46f13624dd21cc5204729f311984c5b6a90d1c2a Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 17 May 2018 14:45:45 -0700 Subject: [PATCH 2/3] qcacmn: Update qca_vendor with NAN attributes for TCP/IP info Update qca_vendor with NAN attributes for TCP/IP info for IPv6 address transport port and transport protocol. Change-Id: I2176cede68347c92b6f4ddddadfa56b9591ff8fa CRs-Fixed: 2244176 --- os_if/linux/qca_vendor.h | 61 +++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/os_if/linux/qca_vendor.h b/os_if/linux/qca_vendor.h index 81baf6dcb984..9b76d144827d 100644 --- a/os_if/linux/qca_vendor.h +++ b/os_if/linux/qca_vendor.h @@ -3594,35 +3594,44 @@ enum qca_wlan_vendor_attr_rssi_monitoring { * @QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_INFO: Array of channel/band width * @QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_AFTER_LAST: id after last valid attribute * @QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_MAX: max value of this enum type + * @QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR: IPv6 address used by NDP, 16 bytes array + * @QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PORT: Unsigned 16-bit value indicating + * transport port used by NDP. + * QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PROTOCOL: Unsigned 8-bit value indicating + * protocol used by NDP and assigned by the Internet Assigned Numbers Authority + * as per: www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml */ enum qca_wlan_vendor_attr_ndp_params { QCA_WLAN_VENDOR_ATTR_NDP_PARAM_INVALID = 0, - QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD, - QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID, - QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID, - QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL, - QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR, - QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR, - QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_SECURITY, - QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_QOS, - QCA_WLAN_VENDOR_ATTR_NDP_APP_INFO, - QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID, - QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID_ARRAY, - QCA_WLAN_VENDOR_ATTR_NDP_RESPONSE_CODE, - QCA_WLAN_VENDOR_ATTR_NDP_NDI_MAC_ADDR, - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE, - QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE, - QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG, - QCA_WLAN_VENDOR_ATTR_NDP_CSID, - QCA_WLAN_VENDOR_ATTR_NDP_PMK, - QCA_WLAN_VENDOR_ATTR_NDP_SCID, - QCA_WLAN_VENDOR_ATTR_NDP_PASSPHRASE, - QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_NAME, - QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_REASON, - QCA_WLAN_VENDOR_ATTR_NDP_NSS, - QCA_WLAN_VENDOR_ATTR_NDP_NUM_CHANNELS, - QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_WIDTH, - QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_INFO, + QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD = 1, + QCA_WLAN_VENDOR_ATTR_NDP_TRANSACTION_ID = 2, + QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID = 3, + QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL = 4, + QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR = 5, + QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR = 6, + QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_SECURITY = 7, + QCA_WLAN_VENDOR_ATTR_NDP_CONFIG_QOS = 8, + QCA_WLAN_VENDOR_ATTR_NDP_APP_INFO = 9, + QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID = 10, + QCA_WLAN_VENDOR_ATTR_NDP_INSTANCE_ID_ARRAY = 11, + QCA_WLAN_VENDOR_ATTR_NDP_RESPONSE_CODE = 12, + QCA_WLAN_VENDOR_ATTR_NDP_NDI_MAC_ADDR = 13, + QCA_WLAN_VENDOR_ATTR_NDP_DRV_RESPONSE_STATUS_TYPE = 14, + QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE = 15, + QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_CONFIG = 16, + QCA_WLAN_VENDOR_ATTR_NDP_CSID = 17, + QCA_WLAN_VENDOR_ATTR_NDP_PMK = 18, + QCA_WLAN_VENDOR_ATTR_NDP_SCID = 19, + QCA_WLAN_VENDOR_ATTR_NDP_PASSPHRASE = 20, + QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_NAME = 21, + QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_REASON = 22, + QCA_WLAN_VENDOR_ATTR_NDP_NSS = 23, + QCA_WLAN_VENDOR_ATTR_NDP_NUM_CHANNELS = 24, + QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_WIDTH = 25, + QCA_WLAN_VENDOR_ATTR_NDP_CHANNEL_INFO = 26, + QCA_WLAN_VENDOR_ATTR_NDP_IPV6_ADDR = 27, + QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PORT = 28, + QCA_WLAN_VENDOR_ATTR_NDP_TRANSPORT_PROTOCOL = 29, /* keep last */ QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_AFTER_LAST, From b901c808743aca327ea0e079eb74458c619e33a1 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 17 May 2018 14:29:10 -0700 Subject: [PATCH 3/3] qcacmn: Fix compilation error in CP_STATs Fix compilation error in CP_STATs due to change in definition of of wlan_objmgr_get_peer. Change-Id: I15753d942dd3932fbf0d2c8a361e5e507fd38b8e CRs-Fixed: 2244161 --- umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c b/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c index 81eec1d2c6ca..6b8d928c5ab8 100644 --- a/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c +++ b/umac/cp_stats/dispatcher/src/wlan_cp_stats_mc_tgt_api.c @@ -178,7 +178,8 @@ tgt_mc_cp_stats_prepare_raw_peer_rssi(struct wlan_objmgr_psoc *psoc, peer_rssi_iterator, &ev, true, WLAN_CP_STATS_ID); } else { - peer = wlan_objmgr_get_peer(psoc, last_req->pdev_id, mac_addr, WLAN_CP_STATS_ID); + peer = wlan_objmgr_get_peer(psoc, last_req->pdev_id, + mac_addr, WLAN_CP_STATS_ID); if (!peer) { cp_stats_err("peer[%pM] is null", mac_addr); goto end; @@ -522,8 +523,8 @@ tgt_mc_cp_stats_prepare_n_send_raw_station_stats(struct wlan_objmgr_psoc *psoc, return; } - peer = wlan_objmgr_get_peer(psoc, last_req->peer_mac_addr, - WLAN_CP_STATS_ID); + peer = wlan_objmgr_get_peer(psoc, last_req->pdev_id, + last_req->peer_mac_addr, WLAN_CP_STATS_ID); if (!peer) { cp_stats_err("peer object is null"); goto end;