samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove csr_roamstart_bssparams structure

Browse Source 
Add all members of csr_roamstart_bssparams structure to
parent structure and remove csr_roamstart_bssparams structure

Change-Id: Ifa9f38305e72de45776d6ead25a7053063792382
CRs-Fixed: 3247189
This commit is contained in:
Jyoti Kumari
2022-07-19 13:57:23 +05:30
committed by Madan Koyyalamudi
parent 847185c77e
commit 977a4af84c
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/sme/inc/csr_internal.h
View File

@@ -121,17 +121,6 @@ struct bss_config_param {
tSirMacCapabilityInfo BssCap;
};
/* struct csr_roamstart_bssparams: csr bss parameters
* @cb_mode: channel bonding mode
* @bcn_int: beacon interval
* @update_bcn_int: updated beacon interval
*/
struct csr_roamstart_bssparams {
ePhyChanBondState cb_mode;
uint16_t bcn_int;
bool update_bcn_int;
};
struct roam_cmd {
enum csr_roam_reason roamReason;
tSirMacAddr peerMac;
@@ -242,6 +231,9 @@ struct csr_disconnect_stats {
/**
* struct csr_roam_session - CSR per-vdev context
* @vdev_id: ID of the vdev for which this entry is applicable
* @cb_mode: channel bonding mode
* @bcn_int: beacon interval
* @update_bcn_int: updated beacon interval
* @is_bcn_recv_start: Allow to process bcn recv indication
* @beacon_report_do_not_resume: Do not resume the beacon reporting after scan
*/
@@ -256,7 +248,10 @@ struct csr_roam_session {
* to remember some parameters needed for START_BSS.
* All member must be set every time we try to join
*/
struct csr_roamstart_bssparams bssParams;
ePhyChanBondState cb_mode;
uint16_t bcn_int;
bool update_bcn_int;
#ifdef WLAN_BCN_RECV_FEATURE
bool is_bcn_recv_start;
bool beacon_report_do_not_resume;

14
core/sme/src/common/sme_api.c
View File

@@ -7641,21 +7641,21 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
}
session = CSR_GET_SESSION(mac, sessionId);
sme_debug("Update HT operation beacon IE, channel_type=%d cur cbmode %d",
channel_type, session->bssParams.cb_mode);
channel_type, session->cb_mode);
switch (channel_type) {
case eHT_CHAN_HT20:
if (!session->bssParams.cb_mode)
if (!session->cb_mode)
return QDF_STATUS_SUCCESS;
cb_mode = PHY_SINGLE_CHANNEL_CENTERED;
break;
case eHT_CHAN_HT40MINUS:
if (session->bssParams.cb_mode)
if (session->cb_mode)
return QDF_STATUS_SUCCESS;
cb_mode = PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
break;
case eHT_CHAN_HT40PLUS:
if (session->bssParams.cb_mode)
if (session->cb_mode)
return QDF_STATUS_SUCCESS;
cb_mode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
break;
@@ -7663,7 +7663,7 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
sme_err("Error!!! Invalid HT20/40 mode !");
return QDF_STATUS_E_FAILURE;
}
session->bssParams.cb_mode = cb_mode;
session->cb_mode = cb_mode;
status = sme_acquire_global_lock(&mac->sme);
if (QDF_IS_STATUS_SUCCESS(status)) {
status = csr_set_ht2040_mode(mac, sessionId,
@@ -7685,9 +7685,9 @@ QDF_STATUS sme_get_ht2040_mode(mac_handle_t mac_handle, uint8_t vdev_id,
}
session = CSR_GET_SESSION(mac, vdev_id);
sme_debug("Get HT operation beacon IE, channel_type=%d cur cbmode %d",
*channel_type, session->bssParams.cb_mode);
*channel_type, session->cb_mode);
switch (session->bssParams.cb_mode) {
switch (session->cb_mode) {
case PHY_SINGLE_CHANNEL_CENTERED:
*channel_type = eHT_CHAN_HT20;
break;

17
core/sme/src/csr/csr_api_roam.c
View File

@@ -5850,10 +5850,10 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac,
/* NO need to update the Beacon Params if update beacon parameter flag
* is not set
*/
if (!mac->roam.roamSession[sessionId].bssParams.update_bcn_int)
if (!mac->roam.roamSession[sessionId].update_bcn_int)
return QDF_STATUS_SUCCESS;
mac->roam.roamSession[sessionId].bssParams.update_bcn_int =
mac->roam.roamSession[sessionId].update_bcn_int =
false;
/* Create the message and send to lim */
@@ -5875,10 +5875,9 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(struct mac_context *mac,
pMsg->session_id = sessionId;
sme_debug("session %d BeaconInterval %d",
sessionId,
mac->roam.roamSession[sessionId].bssParams.
bcn_int);
mac->roam.roamSession[sessionId].bcn_int);
pMsg->beacon_interval =
mac->roam.roamSession[sessionId].bssParams.bcn_int;
mac->roam.roamSession[sessionId].bcn_int;
status = umac_send_mb_message_to_mac(pMsg);
}
return status;
@@ -7700,14 +7699,14 @@ QDF_STATUS csr_bss_start(struct mac_context *mac, uint32_t vdev_id,
sizeof(struct start_bss_config));
start_bss_cfg->cmd_id = csr_get_monotonous_number(mac);
session->bssParams.cb_mode = start_bss_cfg->sec_ch_offset;
session->bssParams.bcn_int = bss_config->beaconInterval;
candidate.beacon_interval = session->bssParams.bcn_int;
session->cb_mode = start_bss_cfg->sec_ch_offset;
session->bcn_int = bss_config->beaconInterval;
candidate.beacon_interval = session->bcn_int;
candidate.chan_freq = bss_config->oper_ch_freq;
if_mgr_is_beacon_interval_valid(mac->pdev, vdev_id,
&candidate);
bss_config->beaconInterval = candidate.beacon_interval;
session->bssParams.bcn_int = candidate.beacon_interval;
session->bcn_int = candidate.beacon_interval;
cmd.cmd_id = start_bss_cfg->cmd_id;
csr_set_sap_ser_params(&cmd, WLAN_SER_CMD_VDEV_START_BSS);