From c18d6b185c0582e8056e47554c0e688bed2cd288 Mon Sep 17 00:00:00 2001 From: "Adam W. Willis" Date: Mon, 30 Aug 2021 20:37:08 -0400 Subject: [PATCH] qcacmn: Partially rollback LA.UM.9.12.r1-12000-SMxx50.0 merge [2/2] This reverts the following commits: e2075e1 ("qcacmn: Enable/Disable SRD support for vdev") 6bf2c47 ("qcacmn: Inform fw if NAN is disabled on an SRD channel") 0ba7a58 ("qcacmn: Add support to indicate nan channel support to fw") Signed-off-by: Adam W. Willis --- .../umac/regulatory/core/src/reg_priv_objs.c | 2 +- .../umac/regulatory/core/src/reg_priv_objs.h | 2 +- .../inc/reg_services_public_struct.h | 2 +- .../wmi/inc/wmi_unified_param.h | 4 +--- .../wmi/src/wmi_unified_tlv.c | 18 ------------------ 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.c b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.c index 8f31c6a3a3f9..e4e665ab6a90 100644 --- a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.c +++ b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.c @@ -91,7 +91,7 @@ QDF_STATUS wlan_regulatory_psoc_obj_created_notification( soc_reg_obj->vdev_cnt_11d = 0; soc_reg_obj->vdev_id_for_11d_scan = INVALID_VDEV_ID; soc_reg_obj->restart_beaconing = CH_AVOID_RULE_RESTART; - soc_reg_obj->enable_srd_chan_in_master_mode = 0xFF; + soc_reg_obj->enable_srd_chan_in_master_mode = true; soc_reg_obj->enable_11d_in_world_mode = false; soc_reg_obj->retain_nol_across_regdmn_update = false; diff --git a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.h b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.h index dc0c8bce08cd..9743499b081f 100644 --- a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.h +++ b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/core/src/reg_priv_objs.h @@ -141,7 +141,7 @@ struct wlan_regulatory_psoc_priv_obj { struct wlan_psoc_host_hal_reg_capabilities_ext reg_cap[PSOC_MAX_PHY_REG_CAP]; bool force_ssc_disable_indoor_channel; - uint8_t enable_srd_chan_in_master_mode; + bool enable_srd_chan_in_master_mode; bool enable_11d_in_world_mode; qdf_spinlock_t cbk_list_lock; bool retain_nol_across_regdmn_update; diff --git a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h index 2e3f55ee1b59..dd3246356ac8 100644 --- a/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h +++ b/drivers/staging/qca-wifi-host-cmn/umac/regulatory/dispatcher/inc/reg_services_public_struct.h @@ -960,7 +960,7 @@ struct reg_config_vars { uint32_t indoor_chan_enabled; uint32_t force_ssc_disable_indoor_channel; enum restart_beaconing_on_ch_avoid_rule restart_beaconing; - uint8_t enable_srd_chan_in_master_mode; + bool enable_srd_chan_in_master_mode; bool enable_11d_in_world_mode; bool retain_nol_across_regdmn_update; }; diff --git a/drivers/staging/qca-wifi-host-cmn/wmi/inc/wmi_unified_param.h b/drivers/staging/qca-wifi-host-cmn/wmi/inc/wmi_unified_param.h index 53584a8f3c54..2fb5ea066c1f 100644 --- a/drivers/staging/qca-wifi-host-cmn/wmi/inc/wmi_unified_param.h +++ b/drivers/staging/qca-wifi-host-cmn/wmi/inc/wmi_unified_param.h @@ -620,7 +620,6 @@ typedef enum { * @set_agile: is agile mode * @allow_he: HE allowed on chan * @psc_channel: 6 ghz preferred scan chan - * @nan_disabled: is NAN disabled on @mhz * @phy_mode: phymode (vht80 or ht40 or ...) * @cfreq1: centre frequency on primary * @cfreq2: centre frequency on secondary @@ -645,8 +644,7 @@ struct channel_param { allow_vht:1, set_agile:1, allow_he:1, - psc_channel:1, - nan_disabled:1; + psc_channel:1; uint32_t phy_mode; uint32_t cfreq1; uint32_t cfreq2; diff --git a/drivers/staging/qca-wifi-host-cmn/wmi/src/wmi_unified_tlv.c b/drivers/staging/qca-wifi-host-cmn/wmi/src/wmi_unified_tlv.c index acb9a56044fb..e004aad9c03d 100644 --- a/drivers/staging/qca-wifi-host-cmn/wmi/src/wmi_unified_tlv.c +++ b/drivers/staging/qca-wifi-host-cmn/wmi/src/wmi_unified_tlv.c @@ -3305,10 +3305,6 @@ static QDF_STATUS send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle, WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PSC); - if (tchan_info->nan_disabled) - WMI_SET_CHANNEL_FLAG(chan_info, - WMI_CHAN_FLAG_NAN_DISABLED); - /* also fill in power information */ WMI_SET_CHANNEL_MIN_POWER(chan_info, tchan_info->minpower); @@ -6665,19 +6661,6 @@ static void wmi_copy_twt_resource_config(wmi_resource_config *resource_cfg, } #endif -#ifdef WLAN_FEATURE_NAN -static void wmi_set_nan_channel_support(wmi_resource_config *resource_cfg) -{ - WMI_RSRC_CFG_HOST_SERVICE_FLAG_NAN_CHANNEL_SUPPORT_SET( - resource_cfg->host_service_flags, 1); -} -#else -static inline -void wmi_set_nan_channel_support(wmi_resource_config *resource_cfg) -{ -} -#endif - static void wmi_copy_resource_config(wmi_resource_config *resource_cfg, target_resource_config *tgt_res_cfg) @@ -6885,7 +6868,6 @@ void wmi_copy_resource_config(wmi_resource_config *resource_cfg, resource_cfg->host_service_flags, tgt_res_cfg->nan_separate_iface_support); - wmi_set_nan_channel_support(resource_cfg); } /* copy_hw_mode_id_in_init_cmd() - Helper routine to copy hw_mode in init cmd