qcacmn: Remove relaxed_6ghz_conn_policy cfg item
relaxed_6ghz_conn_policy cfg item is no longer needed with new regulatory policy as there is no dependency on STA, AP country code to find 6 GHz power mode for connection and also connect request should be rejected if AP is advertising VLP and STA doesn't support VLP. Hence remove this cfg item and the related APIs. Change-Id: I215939bdce2e08eb9d4c5286487941198ab19232 CRs-Fixed: 3470569
这个提交包含在:
@@ -2676,30 +2676,6 @@ void wlan_cm_set_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
|
|||||||
mlme_psoc_obj->psoc_cfg.score_config.standard_6ghz_conn_policy = value;
|
mlme_psoc_obj->psoc_cfg.score_config.standard_6ghz_conn_policy = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlan_cm_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
|
|
||||||
bool value)
|
|
||||||
{
|
|
||||||
struct psoc_mlme_obj *mlme_psoc_obj;
|
|
||||||
|
|
||||||
mlme_psoc_obj = wlan_psoc_mlme_get_cmpt_obj(psoc);
|
|
||||||
if (!mlme_psoc_obj)
|
|
||||||
return;
|
|
||||||
|
|
||||||
mlme_debug("6ghz relaxed connection policy val %x", value);
|
|
||||||
mlme_psoc_obj->psoc_cfg.score_config.relaxed_6ghz_conn_policy = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlan_cm_get_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc)
|
|
||||||
{
|
|
||||||
struct psoc_mlme_obj *mlme_psoc_obj;
|
|
||||||
|
|
||||||
mlme_psoc_obj = wlan_psoc_mlme_get_cmpt_obj(psoc);
|
|
||||||
if (!mlme_psoc_obj)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return mlme_psoc_obj->psoc_cfg.score_config.relaxed_6ghz_conn_policy;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool wlan_cm_get_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc)
|
bool wlan_cm_get_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc)
|
||||||
{
|
{
|
||||||
struct psoc_mlme_obj *mlme_psoc_obj;
|
struct psoc_mlme_obj *mlme_psoc_obj;
|
||||||
|
@@ -234,7 +234,6 @@ enum cm_security_idx {
|
|||||||
* @check_assoc_disallowed: Should assoc be disallowed if MBO OCE IE indicate so
|
* @check_assoc_disallowed: Should assoc be disallowed if MBO OCE IE indicate so
|
||||||
* @vendor_roam_score_algorithm: Preferred ETP vendor roam score algorithm
|
* @vendor_roam_score_algorithm: Preferred ETP vendor roam score algorithm
|
||||||
* @check_6ghz_security: check security for 6 GHz candidate
|
* @check_6ghz_security: check security for 6 GHz candidate
|
||||||
* @relaxed_6ghz_conn_policy: check for 6 GHz relaxed connection policy
|
|
||||||
* @standard_6ghz_conn_policy: check for 6 GHz standard connection policy
|
* @standard_6ghz_conn_policy: check for 6 GHz standard connection policy
|
||||||
* @key_mgmt_mask_6ghz: user configurable mask for 6 GHz AKM
|
* @key_mgmt_mask_6ghz: user configurable mask for 6 GHz AKM
|
||||||
* @mlsr_link_selection: MLSR link selection config
|
* @mlsr_link_selection: MLSR link selection config
|
||||||
@@ -253,7 +252,6 @@ struct scoring_cfg {
|
|||||||
check_assoc_disallowed:1,
|
check_assoc_disallowed:1,
|
||||||
vendor_roam_score_algorithm:1,
|
vendor_roam_score_algorithm:1,
|
||||||
check_6ghz_security:1,
|
check_6ghz_security:1,
|
||||||
relaxed_6ghz_conn_policy:1,
|
|
||||||
standard_6ghz_conn_policy:1;
|
standard_6ghz_conn_policy:1;
|
||||||
|
|
||||||
uint32_t key_mgmt_mask_6ghz;
|
uint32_t key_mgmt_mask_6ghz;
|
||||||
@@ -412,32 +410,6 @@ void wlan_cm_set_6ghz_key_mgmt_mask(struct wlan_objmgr_psoc *psoc,
|
|||||||
*/
|
*/
|
||||||
uint32_t wlan_cm_get_6ghz_key_mgmt_mask(struct wlan_objmgr_psoc *psoc);
|
uint32_t wlan_cm_get_6ghz_key_mgmt_mask(struct wlan_objmgr_psoc *psoc);
|
||||||
|
|
||||||
/**
|
|
||||||
* wlan_cm_set_relaxed_6ghz_conn_policy() - Set 6 GHz relaxed connection policy
|
|
||||||
* @psoc: pointer to psoc object
|
|
||||||
* @value: value to be set
|
|
||||||
*
|
|
||||||
* Return: void
|
|
||||||
*/
|
|
||||||
void wlan_cm_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
|
|
||||||
bool value);
|
|
||||||
/**
|
|
||||||
* wlan_cm_get_relaxed_6ghz_conn_policy() - Get 6 GHz relaxed connection policy
|
|
||||||
* flag
|
|
||||||
* @psoc: pointer to psoc object
|
|
||||||
*
|
|
||||||
* Return: value
|
|
||||||
*/
|
|
||||||
bool wlan_cm_get_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* wlan_cm_set_standard_6ghz_conn_policy() - Set 6 GHz standard connection
|
|
||||||
* policy
|
|
||||||
* @psoc: pointer to psoc object
|
|
||||||
* @value: value to be set
|
|
||||||
*
|
|
||||||
* Return: void
|
|
||||||
*/
|
|
||||||
void wlan_cm_set_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
|
void wlan_cm_set_standard_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
|
||||||
bool value);
|
bool value);
|
||||||
|
|
||||||
@@ -494,17 +466,6 @@ uint32_t wlan_cm_get_6ghz_key_mgmt_mask(struct wlan_objmgr_psoc *psoc)
|
|||||||
{
|
{
|
||||||
return DEFAULT_KEYMGMT_6G_MASK;
|
return DEFAULT_KEYMGMT_6G_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline
|
|
||||||
void wlan_cm_set_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc,
|
|
||||||
bool value)
|
|
||||||
{}
|
|
||||||
|
|
||||||
static inline
|
|
||||||
bool wlan_cm_get_relaxed_6ghz_conn_policy(struct wlan_objmgr_psoc *psoc)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONN_MGR_ADV_FEATURE
|
#ifdef CONN_MGR_ADV_FEATURE
|
||||||
|
在新工单中引用
屏蔽一个用户