From 8b761b0a66efdea16ebd4f91c584c2d3bbd66d97 Mon Sep 17 00:00:00 2001 From: gaurank kathpalia Date: Sun, 2 Aug 2020 13:37:38 +0530 Subject: [PATCH] qcacmn: Enable/Disable SRD support for vdev Currently the driver enables the SRD channels support for both P2P_GO and SAP if the SRD master mode is enabled. Have individual ini values to enable/disable the SRD channel for each op-mode as required. The ini etsi13_srd_chan_in_master_mode has the following config for individual master modes:- Bit map for enabling the SRD mode in various modes are as follows:- BIT 0:- Enable/Disable SRD channels for SAP. BIT 1:- Enable/Disable SRD channels for P2P-GO. BIT 2:- Enable/Disable SRD channels for NAN. Change-Id: Ia9ca9d49102405b307a410cbf28e3f8896114cac CRs-Fixed: 2760002 --- umac/regulatory/core/src/reg_priv_objs.c | 2 +- umac/regulatory/core/src/reg_priv_objs.h | 2 +- umac/regulatory/dispatcher/inc/reg_services_public_struct.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/umac/regulatory/core/src/reg_priv_objs.c b/umac/regulatory/core/src/reg_priv_objs.c index 6362e09ffd4c..8279df919038 100644 --- a/umac/regulatory/core/src/reg_priv_objs.c +++ b/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 = true; + soc_reg_obj->enable_srd_chan_in_master_mode = 0xFF; soc_reg_obj->enable_11d_in_world_mode = false; soc_reg_obj->five_dot_nine_ghz_supported = false; soc_reg_obj->enable_5dot9_ghz_chan_in_master_mode = false; diff --git a/umac/regulatory/core/src/reg_priv_objs.h b/umac/regulatory/core/src/reg_priv_objs.h index 057420928df2..e35745f44418 100644 --- a/umac/regulatory/core/src/reg_priv_objs.h +++ b/umac/regulatory/core/src/reg_priv_objs.h @@ -148,7 +148,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; - bool enable_srd_chan_in_master_mode; + uint8_t enable_srd_chan_in_master_mode; bool enable_11d_in_world_mode; bool enable_5dot9_ghz_chan_in_master_mode; qdf_spinlock_t cbk_list_lock; diff --git a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h index 285fd195d001..1eafc26aeab3 100644 --- a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h +++ b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h @@ -991,7 +991,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; - bool enable_srd_chan_in_master_mode; + uint8_t enable_srd_chan_in_master_mode; bool enable_11d_in_world_mode; bool enable_5dot9_ghz_chan_in_master_mode; bool retain_nol_across_regdmn_update;