qcacld-3.0: Fill op and ext rates in LIM

Fill operational and extended rates in LIM
instead of CSR as part of connection manager.

Change-Id: I9197e835703059d61bc67897a9670ff166460318
CRs-Fixed: 2892415
This commit is contained in:
Utkarsh Bhatnagar
2021-03-05 01:14:23 +05:30
committed by snandini
parent 59deb24ee4
commit 6664a74b45
20 changed files with 656 additions and 1025 deletions

View File

@@ -1246,12 +1246,6 @@ static bool is_sae_sap_enabled(struct wlan_objmgr_psoc *psoc)
static void mlme_init_sap_cfg(struct wlan_objmgr_psoc *psoc,
struct wlan_mlme_cfg_sap *sap_cfg)
{
uint8_t *ssid;
ssid = cfg_default(CFG_SSID);
qdf_mem_zero(sap_cfg->cfg_ssid, WLAN_SSID_MAX_LEN);
sap_cfg->cfg_ssid_len = STR_SSID_DEFAULT_LEN;
qdf_mem_copy(sap_cfg->cfg_ssid, ssid, STR_SSID_DEFAULT_LEN);
sap_cfg->beacon_interval = cfg_get(psoc, CFG_BEACON_INTERVAL);
sap_cfg->dtim_interval = cfg_default(CFG_DTIM_PERIOD);
sap_cfg->listen_interval = cfg_default(CFG_LISTEN_INTERVAL);
@@ -1959,29 +1953,6 @@ static void mlme_init_nss_chains(struct wlan_objmgr_psoc *psoc,
nss_chains->enable_dynamic_nss_chains_cfg =
cfg_get(psoc, CFG_ENABLE_DYNAMIC_NSS_CHAIN_CONFIG);
}
static void mlme_init_wep_keys(struct wlan_mlme_wep_cfg *wep_params)
{
/* initialize the default key values to zero */
wep_params->wep_default_key_1.len = WLAN_CRYPTO_KEY_WEP104_LEN;
wep_params->wep_default_key_1.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
qdf_mem_zero(wep_params->wep_default_key_1.data,
WLAN_CRYPTO_KEY_WEP104_LEN);
wep_params->wep_default_key_2.len = WLAN_CRYPTO_KEY_WEP104_LEN;
wep_params->wep_default_key_2.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
qdf_mem_zero(wep_params->wep_default_key_2.data,
WLAN_CRYPTO_KEY_WEP104_LEN);
wep_params->wep_default_key_3.len = WLAN_CRYPTO_KEY_WEP104_LEN;
wep_params->wep_default_key_3.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
qdf_mem_zero(wep_params->wep_default_key_3.data,
WLAN_CRYPTO_KEY_WEP104_LEN);
wep_params->wep_default_key_4.len = WLAN_CRYPTO_KEY_WEP104_LEN;
wep_params->wep_default_key_4.max_len = WLAN_CRYPTO_KEY_WEP104_LEN;
qdf_mem_zero(wep_params->wep_default_key_4.data,
WLAN_CRYPTO_KEY_WEP104_LEN);
}
static void mlme_init_wep_cfg(struct wlan_mlme_wep_cfg *wep_params)
{
@@ -1993,7 +1964,6 @@ static void mlme_init_wep_cfg(struct wlan_mlme_wep_cfg *wep_params)
cfg_default(CFG_OPEN_SYSTEM_AUTH_ENABLE);
wep_params->wep_default_key_id = cfg_default(CFG_WEP_DEFAULT_KEYID);
mlme_init_wep_keys(wep_params);
}
static void mlme_init_wifi_pos_cfg(struct wlan_objmgr_psoc *psoc,

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -23,16 +23,6 @@
#ifndef __CFG_MLME_SAP_H
#define __CFG_MLME_SAP_H
#define STR_SSID_DEFAULT "1234567890"
#define STR_SSID_DEFAULT_LEN sizeof(STR_SSID_DEFAULT)
#define CFG_SSID CFG_STRING( \
"cfg_ssid", \
0, \
STR_SSID_DEFAULT_LEN, \
STR_SSID_DEFAULT, \
"CFG_SSID")
#define CFG_BEACON_INTERVAL CFG_INI_UINT( \
"gBeaconInterval", \
0, \
@@ -735,7 +725,6 @@
#define CFG_SAP_ALL \
CFG_SAP_SAE \
CFG(CFG_AP_ENABLE_RANDOM_BSSID) \
CFG(CFG_SSID) \
CFG(CFG_BEACON_INTERVAL) \
CFG(CFG_DTIM_PERIOD) \
CFG(CFG_LISTEN_INTERVAL) \

View File

@@ -88,17 +88,6 @@ QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev,
enum wep_key_id wep_keyid, uint8_t *default_key,
qdf_size_t *key_len);
/**
* mlme_set_wep_key() - set the wep keys during auth
* @wep_params: cfg wep parametrs structure
* @wep_key_id: default key number that needs to be copied
* @key_to_set: destination buffer to be copied
* @len: size to be copied
*/
QDF_STATUS mlme_set_wep_key(struct wlan_mlme_wep_cfg *wep_params,
enum wep_key_id wep_keyid, uint8_t *key_to_set,
qdf_size_t len);
/**
* wlan_mlme_get_tx_power() - Get the max tx power in particular band
* @psoc: pointer to psoc object

View File

@@ -742,8 +742,6 @@ struct wlan_mlme_wps_params {
* @is_6g_sap_fd_enabled: enable fils discovery on sap
*/
struct wlan_mlme_cfg_sap {
uint8_t cfg_ssid[WLAN_SSID_MAX_LEN];
uint8_t cfg_ssid_len;
uint16_t beacon_interval;
uint16_t dtim_interval;
uint16_t listen_interval;
@@ -2250,10 +2248,6 @@ enum wep_key_id {
* @is_auth_open_system: Flag to check if the auth type is open
* @auth_type: Authentication type value
* @wep_default_key_id: Default WEP key id
* @wep_default_key_1: WEP encryption key 1
* @wep_default_key_2: WEP encryption key 2
* @wep_default_key_3: WEP encryption key 3
* @wep_default_key_4: WEP encryption key 4
*/
struct wlan_mlme_wep_cfg {
bool is_privacy_enabled;
@@ -2261,10 +2255,6 @@ struct wlan_mlme_wep_cfg {
bool is_auth_open_system;
uint8_t auth_type;
uint8_t wep_default_key_id;
struct mlme_cfg_str wep_default_key_1;
struct mlme_cfg_str wep_default_key_2;
struct mlme_cfg_str wep_default_key_3;
struct mlme_cfg_str wep_default_key_4;
};
/**

View File

@@ -2638,48 +2638,6 @@ QDF_STATUS mlme_get_wep_key(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_SUCCESS;
}
QDF_STATUS mlme_set_wep_key(struct wlan_mlme_wep_cfg *wep_params,
enum wep_key_id wep_keyid, uint8_t *key_to_set,
qdf_size_t len)
{
if (len == 0)
return QDF_STATUS_E_FAILURE;
mlme_legacy_debug("WEP set key for key_id:%d key_len:%zd",
wep_keyid, len);
switch (wep_keyid) {
case MLME_WEP_DEFAULT_KEY_1:
wlan_mlme_set_cfg_str(key_to_set,
&wep_params->wep_default_key_1,
len);
break;
case MLME_WEP_DEFAULT_KEY_2:
wlan_mlme_set_cfg_str(key_to_set,
&wep_params->wep_default_key_2,
len);
break;
case MLME_WEP_DEFAULT_KEY_3:
wlan_mlme_set_cfg_str(key_to_set,
&wep_params->wep_default_key_3,
len);
break;
case MLME_WEP_DEFAULT_KEY_4:
wlan_mlme_set_cfg_str(key_to_set,
&wep_params->wep_default_key_4,
len);
break;
default:
mlme_legacy_err("Invalid key id:%d", wep_keyid);
return QDF_STATUS_E_INVAL;
}
return QDF_STATUS_SUCCESS;
}
QDF_STATUS
wlan_mlme_is_11h_enabled(struct wlan_objmgr_psoc *psoc, bool *value)
{

View File

@@ -1016,7 +1016,10 @@ QDF_STATUS wlan_cm_send_connect_rsp(struct scheduler_msg *msg)
}
}
cm_csr_connect_rsp(vdev, rsp);
status = wlan_cm_connect_rsp(vdev, &rsp->connect_rsp);
if (rsp->connect_rsp.is_reassoc)
status = wlan_cm_reassoc_rsp(vdev, &rsp->connect_rsp);
else
status = wlan_cm_connect_rsp(vdev, &rsp->connect_rsp);
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
wlan_cm_free_connect_rsp(rsp);