diff --git a/components/mlme/core/src/wlan_mlme_main.c b/components/mlme/core/src/wlan_mlme_main.c index 735a473b88..fa4bc1a4c0 100644 --- a/components/mlme/core/src/wlan_mlme_main.c +++ b/components/mlme/core/src/wlan_mlme_main.c @@ -1411,8 +1411,6 @@ static void mlme_init_sta_cfg(struct wlan_objmgr_psoc *psoc, cfg_get(psoc, CFG_QCN_IE_SUPPORT); sta->fils_max_chan_guard_time = cfg_get(psoc, CFG_FILS_MAX_CHAN_GUARD_TIME); - sta->force_rsne_override = - cfg_get(psoc, CFG_FORCE_RSNE_OVERRIDE); sta->single_tid = cfg_get(psoc, CFG_SINGLE_TID_RC); sta->sta_miracast_mcc_rest_time = diff --git a/components/mlme/dispatcher/inc/cfg_mlme_sta.h b/components/mlme/dispatcher/inc/cfg_mlme_sta.h index 926bd3e6ca..d1d61799f0 100644 --- a/components/mlme/dispatcher/inc/cfg_mlme_sta.h +++ b/components/mlme/dispatcher/inc/cfg_mlme_sta.h @@ -289,30 +289,6 @@ CFG_VALUE_OR_DEFAULT, \ "Set maximum channel guard time") -/* - * - * force_rsne_override - force rsnie override from user - * @Min: 0 - * @Max: 1 - * @Default: 0 - * - * This ini is used to enable/disable test mode to force rsne override used in - * security enhancement test cases to pass the RSNIE sent by user in - * assoc request. - * - * Related: None - * - * Supported Feature: STA - * - * Usage: internal - * - * - */ -#define CFG_FORCE_RSNE_OVERRIDE CFG_INI_BOOL( \ - "force_rsne_override", \ - 0, \ - "Set obss active dwelltime") - /* * * SingleTIDRC - Set replay counter for all TID's @@ -469,7 +445,6 @@ CFG(CFG_QCN_IE_SUPPORT) \ CFG(CFG_STA_MCAST_MCC_REST_TIME) \ CFG(CFG_FILS_MAX_CHAN_GUARD_TIME) \ - CFG(CFG_FORCE_RSNE_OVERRIDE) \ CFG(CFG_SINGLE_TID_RC) \ CFG(CFG_STA_KEEPALIVE_METHOD) \ CFG(CFG_WT_CNF_TIMEOUT) \ diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h index 7b3c0670bb..248b2f42f2 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h @@ -1338,7 +1338,6 @@ struct wlan_mlme_sta_cfg { bool deauth_before_connection; bool enable_go_cts2self_for_sta; bool qcn_ie_support; - bool force_rsne_override; bool single_tid; bool allow_tpc_from_ap; enum station_keepalive_method sta_keepalive_method; diff --git a/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h b/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h index 0abca96b1c..af96a2fc8c 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_ucfg_api.h @@ -982,17 +982,6 @@ QDF_STATUS ucfg_mlme_get_go_cts2self_for_sta(struct wlan_objmgr_psoc *psoc, bool *val); -/** - * ucfg_mlme_get_force_rsne_override() - Force rsnie override from user - * @psoc: pointer to psoc object - * @val: Pointer to the value which will be filled for the caller - * - * Return: QDF Status - */ -QDF_STATUS -ucfg_mlme_get_force_rsne_override(struct wlan_objmgr_psoc *psoc, - bool *val); - /** * ucfg_mlme_get_qcn_ie_support() - QCN IE support or not * @psoc: pointer to psoc object diff --git a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c index 2ed7543ec5..1627ece8da 100644 --- a/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c +++ b/components/mlme/dispatcher/src/wlan_mlme_ucfg_api.c @@ -684,23 +684,6 @@ ucfg_mlme_get_go_cts2self_for_sta(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_SUCCESS; } -QDF_STATUS -ucfg_mlme_get_force_rsne_override(struct wlan_objmgr_psoc *psoc, - bool *val) -{ - struct wlan_mlme_psoc_ext_obj *mlme_obj; - - mlme_obj = mlme_get_psoc_ext_obj(psoc); - if (!mlme_obj) { - *val = cfg_default(CFG_FORCE_RSNE_OVERRIDE); - return QDF_STATUS_E_INVAL; - } - - *val = mlme_obj->cfg.sta.force_rsne_override; - - return QDF_STATUS_SUCCESS; -} - QDF_STATUS ucfg_mlme_get_qcn_ie_support(struct wlan_objmgr_psoc *psoc, bool *val) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 86b3d07baa..edf0ed9a6f 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -7510,14 +7510,8 @@ static int hdd_config_rsn_ie(struct hdd_adapter *adapter, const struct nlattr *attr) { struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - bool override_enabled; uint8_t force_rsne_override; - /* ignore unless support explicitly enabled */ - ucfg_mlme_get_force_rsne_override(hdd_ctx->psoc, &override_enabled); - if (!override_enabled) - return 0; - force_rsne_override = nla_get_u8(attr); if (force_rsne_override > 1) { hdd_err("Invalid value %d", force_rsne_override);