From d29645750214c0ef9c59131e1466fe5eb9eb53d7 Mon Sep 17 00:00:00 2001 From: Srinivas Dasari Date: Wed, 20 May 2020 00:21:51 +0530 Subject: [PATCH] qcacld-3.0: Rename nan_disable_support to nan_conc_controlled_by_host nan_disable_support is the firmware capability to allow host to disable NAN. So that host can disable NAN in any unsupported concurrencies. This was actually introduced to handle NAN concurrencies. Rename the capability flag and corresponding APIs across host driver to resemble the functionality. Change-Id: I24805194fdb855040bcc518acc96459ee7cb5128 CRs-Fixed: 2729984 --- components/nan/core/inc/nan_public_structs.h | 6 ++++-- components/nan/core/src/nan_main.c | 2 +- components/nan/dispatcher/inc/nan_ucfg_api.h | 10 +++++----- components/nan/dispatcher/src/nan_ucfg_api.c | 6 +++--- core/hdd/src/wlan_hdd_main.c | 2 +- core/wma/src/wma_main.c | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/components/nan/core/inc/nan_public_structs.h b/components/nan/core/inc/nan_public_structs.h index 2b72edb77657..40f14577215c 100644 --- a/components/nan/core/inc/nan_public_structs.h +++ b/components/nan/core/inc/nan_public_structs.h @@ -800,7 +800,9 @@ struct wlan_nan_rx_ops { /** * struct nan_tgt_caps - NAN Target capabilities - * @nan_disable_supported: Target supports disabling NAN Discovery + * @nan_conc_control: Target supports disabling NAN Discovery from host + * so that host is able to handle(disable) NAN + * concurrencies. * @nan_dbs_supported: Target supports NAN Discovery with DBS * @ndi_dbs_supported: Target supports NAN Datapath with DBS * @nan_sap_supported: Target supports NAN Discovery with SAP concurrency @@ -810,7 +812,7 @@ struct wlan_nan_rx_ops { * by Fw or not. */ struct nan_tgt_caps { - uint32_t nan_disable_supported:1; + uint32_t nan_conc_control:1; uint32_t nan_dbs_supported:1; uint32_t ndi_dbs_supported:1; uint32_t nan_sap_supported:1; diff --git a/components/nan/core/src/nan_main.c b/components/nan/core/src/nan_main.c index ab043985cbda..67a19aace3c8 100644 --- a/components/nan/core/src/nan_main.c +++ b/components/nan/core/src/nan_main.c @@ -1387,5 +1387,5 @@ bool wlan_nan_get_sap_conc_support(struct wlan_objmgr_psoc *psoc) return (psoc_nan_obj->nan_caps.nan_sap_supported && psoc_nan_obj->nan_caps.nan_dbs_supported && - psoc_nan_obj->nan_caps.nan_disable_supported); + psoc_nan_obj->nan_caps.nan_conc_control); } diff --git a/components/nan/dispatcher/inc/nan_ucfg_api.h b/components/nan/dispatcher/inc/nan_ucfg_api.h index f71dc005ff33..91b175314087 100644 --- a/components/nan/dispatcher/inc/nan_ucfg_api.h +++ b/components/nan/dispatcher/inc/nan_ucfg_api.h @@ -238,14 +238,14 @@ QDF_STATUS ucfg_nan_get_callbacks(struct wlan_objmgr_psoc *psoc, QDF_STATUS ucfg_nan_discovery_req(void *in_req, uint32_t req_type); /** - * ucfg_is_nan_disable_supported() - ucfg API to query NAN Disable support + * ucfg_is_nan_conc_control_supported() - is NAN concurrency controlled by host * @psoc: pointer to psoc object * - * This function returns NAN Disable support status + * This function returns NAN concurrency support status * - * Return: True if NAN Disable is supported, False otherwise + * Return: True if NAN concurrency is controlled by host, False otherwise */ -bool ucfg_is_nan_disable_supported(struct wlan_objmgr_psoc *psoc); +bool ucfg_is_nan_conc_control_supported(struct wlan_objmgr_psoc *psoc); /** * ucfg_is_nan_dbs_supported() - ucfg API to query NAN DBS support @@ -529,7 +529,7 @@ ucfg_nan_disable_ndi(struct wlan_objmgr_psoc *psoc, uint32_t ndi_vdev_id) } static inline -bool ucfg_is_nan_disable_supported(struct wlan_objmgr_psoc *psoc) +bool ucfg_is_nan_conc_control_supported(struct wlan_objmgr_psoc *psoc) { return false; } diff --git a/components/nan/dispatcher/src/nan_ucfg_api.c b/components/nan/dispatcher/src/nan_ucfg_api.c index be147f5c5882..9c91fde22a9f 100644 --- a/components/nan/dispatcher/src/nan_ucfg_api.c +++ b/components/nan/dispatcher/src/nan_ucfg_api.c @@ -565,7 +565,7 @@ void ucfg_nan_set_tgt_caps(struct wlan_objmgr_psoc *psoc, psoc_priv->nan_caps = *nan_caps; } -bool ucfg_is_nan_disable_supported(struct wlan_objmgr_psoc *psoc) +bool ucfg_is_nan_conc_control_supported(struct wlan_objmgr_psoc *psoc) { struct nan_psoc_priv_obj *psoc_priv; @@ -575,7 +575,7 @@ bool ucfg_is_nan_disable_supported(struct wlan_objmgr_psoc *psoc) return false; } - return (psoc_priv->nan_caps.nan_disable_supported == 1); + return (psoc_priv->nan_caps.nan_conc_control == 1); } bool ucfg_is_nan_dbs_supported(struct wlan_objmgr_psoc *psoc) @@ -799,7 +799,7 @@ void ucfg_nan_disable_concurrency(struct wlan_objmgr_psoc *psoc) return; } - if (!ucfg_is_nan_disable_supported(psoc)) + if (!ucfg_is_nan_conc_control_supported(psoc)) return; qdf_spin_lock_bh(&psoc_priv->lock); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 3d32a2978dc2..3fbed144cc2c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6656,7 +6656,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, if ((adapter->device_mode == QDF_NAN_DISC_MODE || (adapter->device_mode == QDF_STA_MODE && !ucfg_nan_is_vdev_creation_allowed(hdd_ctx->psoc))) && - ucfg_is_nan_disable_supported(hdd_ctx->psoc) && + ucfg_is_nan_conc_control_supported(hdd_ctx->psoc) && ucfg_is_nan_disc_active(hdd_ctx->psoc)) ucfg_disable_nan_discovery(hdd_ctx->psoc, NULL, 0); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 8c3c01dd50ef..cd22f54cb277 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -5228,7 +5228,7 @@ static void wma_update_nan_target_caps(tp_wma_handle wma_handle, { if (wmi_service_enabled(wma_handle->wmi_handle, wmi_service_nan_disable_support)) - tgt_cfg->nan_caps.nan_disable_supported = 1; + tgt_cfg->nan_caps.nan_conc_control = 1; if (wmi_service_enabled(wma_handle->wmi_handle, wmi_service_nan_dbs_support))