qcacld-3.0: Remove INI parameter ImplicitQosIsEnabled

As part of WiFi ini clean-up FR, the ini parameter ImplicitQosIsEnabled,
is identified as an obselete parameter and hence it can be deprecated.

Change-Id: Id2ea893ec714150d6144aead2dc3c2b5967d805b
CRs-Fixed: 2896059
This commit is contained in:
Aditya Kodukula
2021-03-19 12:29:48 -07:00
committed by snandini
parent edfbff8b2a
commit 38bc15e6c7
7 changed files with 6 additions and 74 deletions

View File

@@ -2077,8 +2077,6 @@ static void mlme_init_wmm_in_cfg(struct wlan_objmgr_psoc *psoc,
cfg_get(psoc, CFG_QOS_WMM_80211E_ENABLED); cfg_get(psoc, CFG_QOS_WMM_80211E_ENABLED);
wmm_params->wmm_config.uapsd_mask = wmm_params->wmm_config.uapsd_mask =
cfg_get(psoc, CFG_QOS_WMM_UAPSD_MASK); cfg_get(psoc, CFG_QOS_WMM_UAPSD_MASK);
wmm_params->wmm_config.bimplicit_qos_enabled =
cfg_get(psoc, CFG_QOS_WMM_IMPLICIT_SETUP_ENABLED);
mlme_init_inactivity_intv(psoc, wmm_params); mlme_init_inactivity_intv(psoc, wmm_params);
wmm_params->wmm_tspec_element.burst_size_def = wmm_params->wmm_tspec_element.burst_size_def =

View File

@@ -855,28 +855,6 @@
CFG_VALUE_OR_DEFAULT, \ CFG_VALUE_OR_DEFAULT, \
"setup U-APSD mask for ACs") "setup U-APSD mask for ACs")
/*
* <ini>
* ImplicitQosIsEnabled - Enableimplicit QOS
* @Min: 0
* @Max: 1
* @Default: 0
*
* This ini is used to enable/disable implicit QOS.
*
* Related: None.
*
* Supported Feature: WMM
*
* Usage: External
*
* </ini>
*/
#define CFG_QOS_WMM_IMPLICIT_SETUP_ENABLED CFG_INI_BOOL( \
"ImplicitQosIsEnabled", \
0, \
"Enable implicit QOS")
#ifdef FEATURE_WLAN_ESE #ifdef FEATURE_WLAN_ESE
/* /*
* <ini> * <ini>
@@ -1048,7 +1026,6 @@
CFG(CFG_QOS_WMM_MODE) \ CFG(CFG_QOS_WMM_MODE) \
CFG(CFG_QOS_WMM_80211E_ENABLED) \ CFG(CFG_QOS_WMM_80211E_ENABLED) \
CFG(CFG_QOS_WMM_UAPSD_MASK) \ CFG(CFG_QOS_WMM_UAPSD_MASK) \
CFG(CFG_QOS_WMM_IMPLICIT_SETUP_ENABLED) \
QOS_CFG \ QOS_CFG \
CFG(CFG_QOS_WMM_BURST_SIZE_DEFN) \ CFG(CFG_QOS_WMM_BURST_SIZE_DEFN) \
CFG(CFG_QOS_WMM_TS_INFO_ACK_POLICY) \ CFG(CFG_QOS_WMM_TS_INFO_ACK_POLICY) \

View File

@@ -1308,16 +1308,6 @@ wlan_mlme_get_80211e_is_enabled(struct wlan_objmgr_psoc *psoc, bool *value);
QDF_STATUS QDF_STATUS
wlan_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value); wlan_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value);
/**
* wlan_mlme_get_implicit_qos_is_enabled() - Enable implicit QOS
* @psoc: pointer to psoc object
* @value: pointer to the value which will be filled for the caller
*
* Return: QDF Status
*/
QDF_STATUS wlan_mlme_get_implicit_qos_is_enabled(struct wlan_objmgr_psoc *psoc,
bool *value);
#ifdef FEATURE_WLAN_ESE #ifdef FEATURE_WLAN_ESE
/** /**
* wlan_mlme_get_inactivity_interval() - Infra Inactivity Interval * wlan_mlme_get_inactivity_interval() - Infra Inactivity Interval

View File

@@ -1891,13 +1891,11 @@ struct wlan_mlme_lfr_cfg {
* @wmm_mode: Enable WMM feature * @wmm_mode: Enable WMM feature
* @b80211e_is_enabled: Enable 802.11e feature * @b80211e_is_enabled: Enable 802.11e feature
* @uapsd_mask: what ACs to setup U-APSD for at assoc * @uapsd_mask: what ACs to setup U-APSD for at assoc
* @bimplicit_qos_enabled: Enable implicit QOS
*/ */
struct wlan_mlme_wmm_config { struct wlan_mlme_wmm_config {
uint8_t wmm_mode; uint8_t wmm_mode;
bool b80211e_is_enabled; bool b80211e_is_enabled;
uint8_t uapsd_mask; uint8_t uapsd_mask;
bool bimplicit_qos_enabled;
}; };
/** /**

View File

@@ -3274,22 +3274,6 @@ ucfg_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value)
return wlan_mlme_get_wmm_uapsd_mask(psoc, value); return wlan_mlme_get_wmm_uapsd_mask(psoc, value);
} }
/**
* ucfg_mlme_get_implicit_qos_is_enabled() - Enable implicit QOS
* @psoc: pointer to psoc object
* @value: Value that needs to be set from the caller
*
* Inline UCFG API to be used by HDD/OSIF callers
*
* Return: QDF Status
*/
static inline
QDF_STATUS ucfg_mlme_get_implicit_qos_is_enabled(struct wlan_objmgr_psoc *psoc,
bool *value)
{
return wlan_mlme_get_implicit_qos_is_enabled(psoc, value);
}
#ifdef FEATURE_WLAN_ESE #ifdef FEATURE_WLAN_ESE
/** /**
* ucfg_mlme_get_inactivity_interval() - Infra Inactivity Interval * ucfg_mlme_get_inactivity_interval() - Infra Inactivity Interval

View File

@@ -1650,20 +1650,6 @@ wlan_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value)
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
QDF_STATUS wlan_mlme_get_implicit_qos_is_enabled(struct wlan_objmgr_psoc *psoc,
bool *value)
{
struct wlan_mlme_psoc_ext_obj *mlme_obj;
mlme_obj = mlme_get_psoc_ext_obj(psoc);
if (!mlme_obj)
return QDF_STATUS_E_FAILURE;
*value = mlme_obj->cfg.wmm_params.wmm_config.bimplicit_qos_enabled;
return QDF_STATUS_SUCCESS;
}
#ifdef FEATURE_WLAN_ESE #ifdef FEATURE_WLAN_ESE
void wlan_mlme_get_inactivity_interval(struct wlan_objmgr_psoc *psoc, void wlan_mlme_get_inactivity_interval(struct wlan_objmgr_psoc *psoc,
uint32_t *value) uint32_t *value)

View File

@@ -2101,19 +2101,18 @@ QDF_STATUS hdd_wmm_acquire_access(struct hdd_adapter *adapter,
{ {
struct hdd_wmm_qos_context *qos_context; struct hdd_wmm_qos_context *qos_context;
struct hdd_context *hdd_ctx; struct hdd_context *hdd_ctx;
bool enable; /* The ini ImplicitQosIsEnabled is deprecated. By default, the ini
QDF_STATUS status = QDF_STATUS_SUCCESS; * value is disabled. So, setting the variable is_implicit_qos_enabled
* value to false.
*/
bool is_implicit_qos_enabled = false;
hdd_ctx = WLAN_HDD_GET_CTX(adapter); hdd_ctx = WLAN_HDD_GET_CTX(adapter);
QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
"%s: Entered for AC %d", __func__, ac_type); "%s: Entered for AC %d", __func__, ac_type);
status = ucfg_mlme_get_implicit_qos_is_enabled(hdd_ctx->psoc, &enable); if (!hdd_wmm_is_active(adapter) || !(is_implicit_qos_enabled) ||
if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("Get implicit_qos_is_enabled failed");
}
if (!hdd_wmm_is_active(adapter) || !(enable) ||
!adapter->hdd_wmm_status.ac_status[ac_type].is_access_required) { !adapter->hdd_wmm_status.ac_status[ac_type].is_access_required) {
/* either we don't want QoS or the AP doesn't support /* either we don't want QoS or the AP doesn't support
* QoS or we don't want to do implicit QoS * QoS or we don't want to do implicit QoS