diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c
index 70b2ef4b0f..f2bc8e8422 100644
--- a/components/mlme/core/src/wlan_mlme_main.c
+++ b/components/mlme/core/src/wlan_mlme_main.c
@@ -2077,8 +2077,6 @@ static void mlme_init_wmm_in_cfg(struct wlan_objmgr_psoc *psoc,
cfg_get(psoc, CFG_QOS_WMM_80211E_ENABLED);
wmm_params->wmm_config.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);
wmm_params->wmm_tspec_element.burst_size_def =
diff --git a/components/mlme/dispatcher/inc/cfg_mlme_fe_wmm.h b/components/mlme/dispatcher/inc/cfg_mlme_fe_wmm.h
index 62a4f429c4..fac5aa5e35 100644
--- a/components/mlme/dispatcher/inc/cfg_mlme_fe_wmm.h
+++ b/components/mlme/dispatcher/inc/cfg_mlme_fe_wmm.h
@@ -855,28 +855,6 @@
CFG_VALUE_OR_DEFAULT, \
"setup U-APSD mask for ACs")
-/*
- *
- * 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
- *
- *
- */
-#define CFG_QOS_WMM_IMPLICIT_SETUP_ENABLED CFG_INI_BOOL( \
- "ImplicitQosIsEnabled", \
- 0, \
- "Enable implicit QOS")
-
#ifdef FEATURE_WLAN_ESE
/*
*
@@ -1048,7 +1026,6 @@
CFG(CFG_QOS_WMM_MODE) \
CFG(CFG_QOS_WMM_80211E_ENABLED) \
CFG(CFG_QOS_WMM_UAPSD_MASK) \
- CFG(CFG_QOS_WMM_IMPLICIT_SETUP_ENABLED) \
QOS_CFG \
CFG(CFG_QOS_WMM_BURST_SIZE_DEFN) \
CFG(CFG_QOS_WMM_TS_INFO_ACK_POLICY) \
diff --git a/components/mlme/dispatcher/inc/wlan_mlme_api.h b/components/mlme/dispatcher/inc/wlan_mlme_api.h
index 6e4f8a24a3..cd4091685f 100644
--- a/components/mlme/dispatcher/inc/wlan_mlme_api.h
+++ b/components/mlme/dispatcher/inc/wlan_mlme_api.h
@@ -1308,16 +1308,6 @@ wlan_mlme_get_80211e_is_enabled(struct wlan_objmgr_psoc *psoc, bool *value);
QDF_STATUS
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
/**
* wlan_mlme_get_inactivity_interval() - Infra Inactivity Interval
diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
index b14901fe12..e87afd155c 100644
--- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
+++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
@@ -1891,13 +1891,11 @@ struct wlan_mlme_lfr_cfg {
* @wmm_mode: Enable WMM feature
* @b80211e_is_enabled: Enable 802.11e feature
* @uapsd_mask: what ACs to setup U-APSD for at assoc
- * @bimplicit_qos_enabled: Enable implicit QOS
*/
struct wlan_mlme_wmm_config {
uint8_t wmm_mode;
bool b80211e_is_enabled;
uint8_t uapsd_mask;
- bool bimplicit_qos_enabled;
};
/**
diff --git a/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h b/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h
index 8b7f321c3e..af31e9e37f 100644
--- a/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h
+++ b/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h
@@ -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);
}
-/**
- * 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
/**
* ucfg_mlme_get_inactivity_interval() - Infra Inactivity Interval
diff --git a/components/mlme/dispatcher/src/wlan_mlme_api.c b/components/mlme/dispatcher/src/wlan_mlme_api.c
index 7238b140c1..a2ecbdb8cd 100644
--- a/components/mlme/dispatcher/src/wlan_mlme_api.c
+++ b/components/mlme/dispatcher/src/wlan_mlme_api.c
@@ -1650,20 +1650,6 @@ wlan_mlme_get_wmm_uapsd_mask(struct wlan_objmgr_psoc *psoc, uint8_t *value)
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
void wlan_mlme_get_inactivity_interval(struct wlan_objmgr_psoc *psoc,
uint32_t *value)
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index c260f274ca..d3b6d70991 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -2101,19 +2101,18 @@ QDF_STATUS hdd_wmm_acquire_access(struct hdd_adapter *adapter,
{
struct hdd_wmm_qos_context *qos_context;
struct hdd_context *hdd_ctx;
- bool enable;
- QDF_STATUS status = QDF_STATUS_SUCCESS;
+ /* The ini ImplicitQosIsEnabled is deprecated. By default, the ini
+ * 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);
QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG,
"%s: Entered for AC %d", __func__, ac_type);
- status = ucfg_mlme_get_implicit_qos_is_enabled(hdd_ctx->psoc, &enable);
- if (!QDF_IS_STATUS_SUCCESS(status)) {
- hdd_err("Get implicit_qos_is_enabled failed");
- }
- if (!hdd_wmm_is_active(adapter) || !(enable) ||
+ if (!hdd_wmm_is_active(adapter) || !(is_implicit_qos_enabled) ||
!adapter->hdd_wmm_status.ac_status[ac_type].is_access_required) {
/* either we don't want QoS or the AP doesn't support
* QoS or we don't want to do implicit QoS