A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-24 13:44:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename CSR/SME identifier pBssDesc

Browse source 
The Linux Coding Style doesn't allow mixed-case names and
so-called Hungarian notation, so rename the identifier pBssDesc
to be compliant.

Change-Id: I0980de75bbaaeb1eee9321621da1f3ff90e09188
CRs-Fixed: 2463446
This commit is contained in:
Pragaspathi Thilagaraj 2019-05-29 00:49:33 +05:30 • committed by nshrivas
commit 96742aed1e
15 changed files with 224 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

52
core/hdd/src/wlan_hdd_assoc.c
View file

@ -967,7 +967,7 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
if (roam_info) {
/* Save the BSSID for the connection */
if (eCSR_BSS_TYPE_INFRASTRUCTURE == bss_type) {
QDF_ASSERT(roam_info->pBssDesc);
QDF_ASSERT(roam_info->bss_desc);
qdf_copy_macaddr(&sta_ctx->conn_info.bssid,
&roam_info->bssid);
@ -1225,7 +1225,7 @@ hdd_send_new_ap_channel_info(struct net_device *dev,
struct csr_roam_info *roam_info)
{
union iwreq_data wrqu;
struct bss_description *descriptor = roam_info->pBssDesc;
struct bss_description *descriptor = roam_info->bss_desc;
if (!descriptor) {
hdd_err("bss descriptor is null");
@ -1353,7 +1353,7 @@ static void hdd_send_association_event(struct net_device *dev,
if (eConnectionState_Associated == sta_ctx->conn_info.conn_state) {
struct oem_channel_info chan_info = {0};
if (!roam_info || !roam_info->pBssDesc) {
if (!roam_info || !roam_info->bss_desc) {
hdd_warn("STA in associated state but roam_info is null");
return;
}
@ -1364,8 +1364,8 @@ static void hdd_send_association_event(struct net_device *dev,
hdd_green_ap_start_state_mc(hdd_ctx,
adapter->device_mode, true);
}
memcpy(wrqu.ap_addr.sa_data, roam_info->pBssDesc->bssId,
sizeof(roam_info->pBssDesc->bssId));
memcpy(wrqu.ap_addr.sa_data, roam_info->bss_desc->bssId,
sizeof(roam_info->bss_desc->bssId));
ucfg_p2p_status_connect(adapter->vdev);
@ -2082,14 +2082,14 @@ QDF_STATUS hdd_update_dp_vdev_flags(void *cbk_data,
* @adapter: pointer to adapter
* @roam_info: pointer to roam info
* @sta_id: station identifier
* @pBssDesc: pointer to BSS description
* @bss_desc: pointer to BSS description
*
* Return: QDF_STATUS enumeration
*/
QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
struct csr_roam_info *roam_info,
uint8_t sta_id,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
struct ol_txrx_desc_type txrx_desc = { 0 };
@ -2098,7 +2098,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
void *soc = cds_get_context(QDF_MODULE_ID_SOC);
void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pBssDesc)
if (!bss_desc)
return QDF_STATUS_E_FAILURE;
/* Get the Station ID from the one saved during the association */
@ -2319,7 +2319,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
goto done;
}
if (!roam_info || !roam_info->pBssDesc) {
if (!roam_info || !roam_info->bss_desc) {
hdd_err("Invalid CSR roam info");
goto done;
}
@ -2360,7 +2360,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
qdf_mem_copy(rsp_rsn_ie, assoc_rsp, len);
qdf_mem_zero(rsp_rsn_ie + len, IW_GENERIC_IE_MAX - len);
chan_no = roam_info->pBssDesc->channelId;
chan_no = roam_info->bss_desc->channelId;
if (chan_no <= 14)
freq = ieee80211_channel_to_frequency(chan_no,
NL80211_BAND_2GHZ);
@ -2842,14 +2842,14 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
adapter->wapi_info.is_wapi_sta = false;
}
#endif /* FEATURE_WLAN_WAPI */
hdd_debug("bss_descr[%d] devicemode[%d]", !!roam_info->pBssDesc,
adapter->device_mode);
hdd_debug("bss_descr[%d] devicemode[%d]", !!roam_info->bss_desc,
adapter->device_mode);
if ((QDF_STA_MODE == adapter->device_mode) &&
roam_info->pBssDesc) {
ie_len = GET_IE_LEN_IN_BSS(roam_info->pBssDesc->length);
roam_info->bss_desc) {
ie_len = GET_IE_LEN_IN_BSS(roam_info->bss_desc->length);
sta_ctx->ap_supports_immediate_power_save =
wlan_hdd_is_ap_supports_immediate_power_save(
(uint8_t *) roam_info->pBssDesc->ieFields,
(uint8_t *)roam_info->bss_desc->ieFields,
ie_len);
hdd_debug("ap_supports_immediate_power_save flag [%d]",
sta_ctx->ap_supports_immediate_power_save);
@ -3075,7 +3075,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
eCSR_AUTH_TYPE_FT_SUITEB_EAP_SHA384)) {
if (ft_carrier_on) {
if (!hddDisconInProgress &&
roam_info->pBssDesc) {
roam_info->bss_desc) {
struct cfg80211_bss *roam_bss;
/*
@ -3106,7 +3106,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
chan =
ieee80211_get_channel
(adapter->wdev.wiphy,
(int)roam_info->pBssDesc->
(int)roam_info->bss_desc->
channelId);
roam_bss =
@ -3246,7 +3246,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
qdf_status = hdd_roam_register_sta(adapter,
roam_info,
sta_ctx->conn_info.sta_id[0],
roam_info->pBssDesc);
roam_info->bss_desc);
hdd_debug("Enabling queues");
wlan_hdd_netif_queue_control(adapter,
WLAN_WAKE_ALL_NETIF_QUEUE,
@ -3577,9 +3577,9 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
hdd_roam_register_sta(adapter, roam_info,
roam_info->staId,
roam_info->pBssDesc);
roam_info->bss_desc);
if (roam_info->pBssDesc) {
if (roam_info->bss_desc) {
struct cfg80211_bss *bss;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
struct ieee80211_channel *chan;
@ -3590,7 +3590,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
hdd_debug("%s: created ibss " QDF_MAC_ADDR_STR,
adapter->dev->name,
QDF_MAC_ADDR_ARRAY(
roam_info->pBssDesc->bssId));
roam_info->bss_desc->bssId));
/* we must first give cfg80211 the BSS information */
bss = wlan_hdd_cfg80211_update_bss_db(adapter,
@ -3606,7 +3606,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
WLAN_CONTROL_PATH);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
chan_no = roam_info->pBssDesc->channelId;
chan_no = roam_info->bss_desc->channelId;
if (chan_no <= 14)
freq = ieee80211_channel_to_frequency(chan_no,
@ -3624,7 +3624,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
else
hdd_warn("%s: chanId: %d, can't find channel",
adapter->dev->name,
(int)roam_info->pBssDesc->channelId);
(int)roam_info->bss_desc->channelId);
#else
cfg80211_ibss_joined(adapter->dev, bss->bssid,
GFP_KERNEL);
@ -3947,7 +3947,7 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
qdf_status = hdd_roam_register_sta(adapter,
roam_info,
roam_info->staId,
roam_info->pBssDesc);
roam_info->bss_desc);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hdd_err("Cannot register STA for IBSS. qdf_status: %d [%08X]",
qdf_status, qdf_status);
@ -4994,9 +4994,9 @@ hdd_sme_roam_callback(void *context, struct csr_roam_info *roam_info,
break;
case eCSR_ROAM_UPDATE_SCAN_RESULT:
if ((roam_info) && (roam_info->pBssDesc)) {
if ((roam_info) && (roam_info->bss_desc)) {
bss_status = wlan_hdd_inform_bss_frame(adapter,
roam_info->pBssDesc);
roam_info->bss_desc);
if (!bss_status)
hdd_debug("UPDATE_SCAN_RESULT returned NULL");
else

6
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -15982,15 +15982,15 @@ wlan_hdd_cfg80211_update_bss_db(struct hdd_adapter *adapter,
sme_roam_get_connect_profile(mac_handle, adapter->vdev_id,
&roamProfile);
if (roamProfile.pBssDesc) {
bss = wlan_hdd_inform_bss_frame(adapter, roamProfile.pBssDesc);
if (roamProfile.bss_desc) {
bss = wlan_hdd_inform_bss_frame(adapter, roamProfile.bss_desc);
if (!bss)
hdd_debug("wlan_hdd_inform_bss_frame returned NULL");
sme_roam_free_connect_profile(&roamProfile);
} else {
hdd_err("roamProfile.pBssDesc is NULL");
hdd_err("roamProfile.bss_desc is NULL");
}
return bss;
}

2
core/hdd/src/wlan_hdd_main.c
View file

@ -6466,7 +6466,7 @@ void hdd_connect_result(struct net_device *dev, const u8 *bssid,
if (WLAN_STATUS_SUCCESS == status) {
struct ieee80211_channel *chan;
int freq;
int chan_no = roam_info->pBssDesc->channelId;
int chan_no = roam_info->bss_desc->channelId;
if (chan_no <= 14)
freq = ieee80211_channel_to_frequency(chan_no,

18
core/mac/src/pe/rrm/rrm_api.c
View file

@ -661,7 +661,7 @@ rrm_process_beacon_report_req(struct mac_context *mac,
* @param eids - pointer to array of eids. If NULL, all ies will be populated.
* @param numEids - number of elements in array eids.
* @start_offset: Offset from where the IEs in the bss_desc should be parsed
* @param pBssDesc - pointer to Bss Description.
* @param bss_desc - pointer to Bss Description.
*
* Returns: Remaining length of IEs in current bss_desc which are not included
* in pIes.
@ -670,20 +670,20 @@ static uint8_t
rrm_fill_beacon_ies(struct mac_context *mac,
uint8_t *pIes, uint8_t *pNumIes, uint8_t pIesMaxSize,
uint8_t *eids, uint8_t numEids, uint8_t start_offset,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
uint8_t len, *pBcnIes, count = 0, i;
uint16_t BcnNumIes, total_ies_len;
uint8_t rem_len = 0;
if ((!pIes) || (!pNumIes) || (!pBssDesc)) {
if ((!pIes) || (!pNumIes) || (!bss_desc)) {
pe_err("Invalid parameters");
return 0;
}
/* Make sure that if eid is null, numEids is set to zero. */
numEids = (!eids) ? 0 : numEids;
total_ies_len = GET_IE_LEN_IN_BSS(pBssDesc->length);
total_ies_len = GET_IE_LEN_IN_BSS(bss_desc->length);
BcnNumIes = total_ies_len;
if (start_offset > BcnNumIes) {
pe_err("Invalid start offset %d Bcn IE len %d",
@ -691,7 +691,7 @@ rrm_fill_beacon_ies(struct mac_context *mac,
return 0;
}
pBcnIes = (uint8_t *) &pBssDesc->ieFields[0];
pBcnIes = (uint8_t *)&bss_desc->ieFields[0];
pBcnIes += start_offset;
BcnNumIes = BcnNumIes - start_offset;
@ -703,16 +703,16 @@ rrm_fill_beacon_ies(struct mac_context *mac,
* (BEACON_FRAME_IES_OFFSET) in the first fragment.
*/
if (start_offset == 0) {
*((uint32_t *)pIes) = pBssDesc->timeStamp[0];
*((uint32_t *)pIes) = bss_desc->timeStamp[0];
*pNumIes += sizeof(uint32_t);
pIes += sizeof(uint32_t);
*((uint32_t *)pIes) = pBssDesc->timeStamp[1];
*((uint32_t *)pIes) = bss_desc->timeStamp[1];
*pNumIes += sizeof(uint32_t);
pIes += sizeof(uint32_t);
*((uint16_t *)pIes) = pBssDesc->beaconInterval;
*((uint16_t *)pIes) = bss_desc->beaconInterval;
*pNumIes += sizeof(uint16_t);
pIes += sizeof(uint16_t);
*((uint16_t *)pIes) = pBssDesc->capabilityInfo;
*((uint16_t *)pIes) = bss_desc->capabilityInfo;
*pNumIes += sizeof(uint16_t);
pIes += sizeof(uint16_t);
}

10
core/sme/inc/csr_api.h
View file

@ -450,7 +450,7 @@ typedef enum {
eCSR_ROAM_RESULT_SUCCESS = eCSR_ROAM_RESULT_NONE,
/*
* If roamStatus is eCSR_ROAM_ASSOCIATION_COMPLETION,
* struct csr_roam_info's pBssDesc may pass back
* struct csr_roam_info's bss_desc may pass back
*/
eCSR_ROAM_RESULT_FAILURE,
/* Pass back pointer to struct csr_roam_info */
@ -463,7 +463,7 @@ typedef enum {
eCSR_ROAM_RESULT_CAP_CHANGED,
/*
* This means we starts an IBSS struct csr_roam_info's
* pBssDesc may pass back
* bss_desc may pass back
*/
eCSR_ROAM_RESULT_IBSS_STARTED,
eCSR_ROAM_RESULT_IBSS_START_FAILED,
@ -473,7 +473,7 @@ typedef enum {
eCSR_ROAM_RESULT_IBSS_INACTIVE,
/*
* If roamStatus is eCSR_ROAM_ASSOCIATION_COMPLETION struct
* csr_roam_info's pBssDesc may pass back and the peer's MAC
* csr_roam_info's bss_desc may pass back and the peer's MAC
* address in peerMacOrBssid. If roamStatus is
* eCSR_ROAM_IBSS_IND, the peer's MAC address in
* peerMacOrBssid and a beacon frame of the IBSS in pbFrames
@ -881,7 +881,7 @@ typedef struct tagCsrRoamConnectedProfile {
* which can be WSC IE and/or P2P IE
*/
uint8_t *pAddIEAssoc;
struct bss_description *pBssDesc;
struct bss_description *bss_desc;
bool qap; /* AP supports QoS */
struct mobility_domain_info mdid;
#ifdef FEATURE_WLAN_ESE
@ -1054,7 +1054,7 @@ struct csr_config_params {
struct csr_roam_info {
struct csr_roam_profile *pProfile;
struct bss_description *pBssDesc;
struct bss_description *bss_desc;
uint32_t nBeaconLength;
uint32_t nAssocReqLength;
uint32_t nAssocRspLength;

2
core/sme/inc/csr_internal.h
View file

@ -938,7 +938,7 @@ bool csr_is_concurrent_session_running(struct mac_context *mac);
bool csr_is_infra_ap_started(struct mac_context *mac);
bool csr_is_valid_mc_concurrent_session(struct mac_context *mac,
uint32_t sessionId,
struct bss_description *pBssDesc);
struct bss_description *bss_desc);
bool csr_is_conn_state_connected_infra_ap(struct mac_context *mac,
uint32_t sessionId);
QDF_STATUS csr_get_statistics(struct mac_context *mac,

6
core/sme/inc/csr_support.h
View file

@ -208,7 +208,7 @@ struct csr_timer_info {
uint8_t session_id;
};
#define CSR_IS_11A_BSS(pBssDesc) (eSIR_11A_NW_TYPE == (pBssDesc)->nwType)
#define CSR_IS_11A_BSS(bss_desc) (eSIR_11A_NW_TYPE == (bss_desc)->nwType)
#define CSR_IS_BASIC_RATE(rate) ((rate) & CSR_DOT11_BASIC_RATE_MASK)
#define CSR_IS_QOS_BSS(pIes) \
((pIes)->WMMParams.present || (pIes)->WMMInfoAp.present)
@ -311,7 +311,7 @@ bool csr_rates_is_dot11_rate_supported(struct mac_context *mac_ctx, uint8_t rate
enum bss_type csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype);
/* Caller allocates memory for pIEStruct */
QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs *pIEStruct);
/*
* This function will allocate memory for the parsed IEs to the caller.
@ -319,7 +319,7 @@ QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
* this function succeeds
*/
QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs **ppIEStruct);
tSirScanType csr_get_scan_type(struct mac_context *mac, uint8_t chnId);

2
core/sme/inc/sme_qos_internal.h
View file

@ -83,7 +83,7 @@ typedef enum {
reassoc is done
---------------------------------------------------------------------------*/
typedef struct {
struct bss_description *pBssDesc;
struct bss_description *bss_desc;
struct csr_roam_profile *pProfile;
} sme_QosAssocInfo;

217
core/sme/src/csr/csr_api_roam.c
View file

@ -470,7 +470,7 @@ csr_roam_get_phy_mode_band_for_bss(struct mac_context *mac,
uint8_t operationChn,
enum band_info *pBand);
static QDF_STATUS csr_roam_get_qos_info_from_bss(
struct mac_context *mac, struct bss_description *pBssDesc);
struct mac_context *mac, struct bss_description *bss_desc);
static uint32_t csr_find_ibss_session(struct mac_context *mac);
static uint32_t csr_find_session_by_type(struct mac_context *,
enum QDF_OPMODE);
@ -481,7 +481,7 @@ static bool csr_is_conn_allow_5g_band(struct mac_context *mac,
static QDF_STATUS csr_roam_start_wds(struct mac_context *mac,
uint32_t sessionId,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc);
struct bss_description *bss_desc);
static void csr_init_session(struct mac_context *mac, uint32_t sessionId);
static QDF_STATUS csr_roam_issue_set_key_command(struct mac_context *mac,
uint32_t sessionId,
@ -490,7 +490,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(struct mac_context *mac,
static QDF_STATUS
csr_roam_get_qos_info_from_bss(struct mac_context *mac,
struct bss_description *pBssDesc);
struct bss_description *bss_desc);
static void csr_init_operating_classes(struct mac_context *mac);
@ -1428,17 +1428,17 @@ QDF_STATUS csr_roam_copy_connect_profile(struct mac_context *mac,
size = pSession->pConnectBssDesc->length +
sizeof(pSession->pConnectBssDesc->length);
if (size) {
pProfile->pBssDesc = qdf_mem_malloc(size);
if (pProfile->pBssDesc) {
qdf_mem_copy(pProfile->pBssDesc,
pSession->pConnectBssDesc,
size);
pProfile->bss_desc = qdf_mem_malloc(size);
if (pProfile->bss_desc) {
qdf_mem_copy(pProfile->bss_desc,
pSession->pConnectBssDesc,
size);
status = QDF_STATUS_SUCCESS;
} else {
return QDF_STATUS_E_FAILURE;
}
} else {
pProfile->pBssDesc = NULL;
pProfile->bss_desc = NULL;
}
connected_prof = &(pSession->connectedProfile);
pProfile->AuthType = connected_prof->AuthType;
@ -1496,8 +1496,8 @@ QDF_STATUS csr_roam_get_connect_profile(struct mac_context *mac, uint32_t sessio
void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile)
{
if (profile->pBssDesc)
qdf_mem_free(profile->pBssDesc);
if (profile->bss_desc)
qdf_mem_free(profile->bss_desc);
if (profile->pAddIEAssoc)
qdf_mem_free(profile->pAddIEAssoc);
qdf_mem_zero(profile, sizeof(tCsrRoamConnectedProfile));
@ -3369,9 +3369,9 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
sme_debug("Assoc complete result: %d status: %d reason: %d",
u2, roam_info->statusCode, roam_info->reasonCode);
beacon_ies = qdf_mem_malloc(sizeof(tDot11fBeaconIEs));
if ((beacon_ies) && (roam_info->pBssDesc)) {
if ((beacon_ies) && (roam_info->bss_desc)) {
status = csr_parse_bss_description_ies(
mac, roam_info->pBssDesc,
mac, roam_info->bss_desc,
beacon_ies);
csr_roam_populate_channels(beacon_ies, roam_info,
&chan1, &chan2);
@ -3462,11 +3462,11 @@ QDF_STATUS csr_roam_call_callback(struct mac_context *mac, uint32_t sessionId,
connectionStatus.bssType =
roam_info->u.pConnectedProfile->BSSType;
if (roam_info->pBssDesc) {
if (roam_info->bss_desc) {
connectionStatus.rssi =
roam_info->pBssDesc->rssi * (-1);
roam_info->bss_desc->rssi * (-1);
connectionStatus.channel =
roam_info->pBssDesc->channelId;
roam_info->bss_desc->channelId;
}
mac->mlme_cfg->sta.current_rssi = connectionStatus.rssi;
@ -3772,7 +3772,7 @@ QDF_STATUS csr_roam_issue_deauth(struct mac_context *mac, uint32_t sessionId,
QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
uint32_t sessionId,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@ -3786,10 +3786,10 @@ QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
* (happens with start IBSS), then nix the BSS description
* that we keep around for the connected BSS) and get out.
*/
if (!pBssDesc) {
if (!bss_desc) {
csr_free_connect_bss_desc(mac, sessionId);
} else {
size = pBssDesc->length + sizeof(pBssDesc->length);
size = bss_desc->length + sizeof(bss_desc->length);
if (pSession->pConnectBssDesc) {
if (((pSession->pConnectBssDesc->length) +
sizeof(pSession->pConnectBssDesc->length)) <
@ -3806,7 +3806,7 @@ QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
if (!pSession->pConnectBssDesc)
status = QDF_STATUS_E_NOMEM;
else
qdf_mem_copy(pSession->pConnectBssDesc, pBssDesc, size);
qdf_mem_copy(pSession->pConnectBssDesc, bss_desc, size);
}
return status;
}
@ -3814,7 +3814,7 @@ QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
static
QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
struct bss_config_param *pBssConfig,
tDot11fBeaconIEs *pIes)
{
@ -3825,10 +3825,10 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
if (!pIes)
return QDF_STATUS_E_FAILURE;
qdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo,
qdf_mem_copy(&pBssConfig->BssCap, &bss_desc->capabilityInfo,
sizeof(tSirMacCapabilityInfo));
/* get qos */
pBssConfig->qosType = csr_get_qos_from_bss_desc(mac, pBssDesc, pIes);
pBssConfig->qosType = csr_get_qos_from_bss_desc(mac, bss_desc, pIes);
/* Take SSID always from profile */
qdf_mem_copy(&pBssConfig->SSID.ssId,
pProfile->SSIDs.SSIDList->SSID.ssId,
@ -3843,12 +3843,12 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
return QDF_STATUS_E_FAILURE;
}
}
if (WLAN_REG_IS_5GHZ_CH(pBssDesc->channelId))
if (WLAN_REG_IS_5GHZ_CH(bss_desc->channelId))
pBssConfig->band = BAND_5G;
else
pBssConfig->band = BAND_2G;
/* phymode */
if (csr_is_phy_mode_match(mac, pProfile->phyMode, pBssDesc,
if (csr_is_phy_mode_match(mac, pProfile->phyMode, bss_desc,
pProfile, &cfgDot11Mode, pIes)) {
pBssConfig->uCfgDot11Mode = cfgDot11Mode;
} else {
@ -3931,7 +3931,7 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
pBssConfig->uPowerLimit =
csr_get11h_power_constraint(mac, &pIes->PowerConstraints);
/* heartbeat */
if (CSR_IS_11A_BSS(pBssDesc))
if (CSR_IS_11A_BSS(bss_desc))
pBssConfig->uHeartBeatThresh =
mac->roam.configParam.HeartbeatThresh50;
else
@ -3943,9 +3943,9 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
* then set the Join Timeout to be 10 x the BeaconInterval.
*/
pBssConfig->uJoinTimeOut = cfg_default(CFG_JOIN_FAILURE_TIMEOUT);
if (pBssDesc->beaconInterval) {
if (bss_desc->beaconInterval) {
/* Make sure it is bigger than the minimal */
join_timeout = QDF_MAX(10 * pBssDesc->beaconInterval,
join_timeout = QDF_MAX(10 * bss_desc->beaconInterval,
cfg_min(CFG_JOIN_FAILURE_TIMEOUT));
if (join_timeout < pBssConfig->uJoinTimeOut)
pBssConfig->uJoinTimeOut = join_timeout;
@ -3959,11 +3959,11 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
(pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AX) ||
(pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AX_ONLY))
pBssConfig->cbMode = csr_get_cb_mode_from_ies(mac,
pBssDesc->channelId, pIes);
bss_desc->channelId, pIes);
else
pBssConfig->cbMode = PHY_SINGLE_CHANNEL_CENTERED;
if (WLAN_REG_IS_24GHZ_CH(pBssDesc->channelId) &&
if (WLAN_REG_IS_24GHZ_CH(bss_desc->channelId) &&
pProfile->force_24ghz_in_ht20) {
pBssConfig->cbMode = PHY_SINGLE_CHANNEL_CENTERED;
sme_debug("force_24ghz_in_ht20 is set so set cbmode to 0");
@ -3975,7 +3975,7 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
QDF_STATUS csr_roam_prepare_bss_config_from_profile(
struct mac_context *mac, struct csr_roam_profile *pProfile,
struct bss_config_param *pBssConfig,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint8_t operationChannel = 0;
@ -4017,7 +4017,7 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
mac->roam.configParam.WMMSupportMode)) {
qAPisEnabled = true;
} else
if (csr_roam_get_qos_info_from_bss(mac, pBssDesc) ==
if (csr_roam_get_qos_info_from_bss(mac, bss_desc) ==
QDF_STATUS_SUCCESS) {
qAPisEnabled = true;
} else {
@ -4082,7 +4082,7 @@ QDF_STATUS csr_roam_prepare_bss_config_from_profile(
static QDF_STATUS
csr_roam_get_qos_info_from_bss(struct mac_context *mac,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
tDot11fBeaconIEs *pIes = NULL;
@ -4090,7 +4090,7 @@ csr_roam_get_qos_info_from_bss(struct mac_context *mac,
do {
if (!QDF_IS_STATUS_SUCCESS(
csr_get_parsed_bss_description_ies(
mac, pBssDesc, &pIes))) {
mac, bss_desc, &pIes))) {
sme_err("csr_get_parsed_bss_description_ies() failed");
break;
}
@ -4355,7 +4355,7 @@ static QDF_STATUS csr_set_qos_to_cfg(struct mac_context *mac, uint32_t sessionId
static QDF_STATUS csr_get_rate_set(struct mac_context *mac,
struct csr_roam_profile *pProfile,
eCsrPhyMode phyMode,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs *pIes,
tSirMacRateSet *pOpRateSet,
tSirMacRateSet *pExRateSet)
@ -4375,7 +4375,7 @@ static QDF_STATUS csr_get_rate_set(struct mac_context *mac,
return status;
}
csr_is_phy_mode_match(mac, phyMode, pBssDesc, pProfile,
csr_is_phy_mode_match(mac, phyMode, bss_desc, pProfile,
&cfgDot11Mode, pIes);
/*
* Originally, we thought that for 11a networks, the 11a rates
@ -4429,7 +4429,7 @@ static QDF_STATUS csr_get_rate_set(struct mac_context *mac,
static void csr_set_cfg_rate_set(struct mac_context *mac, eCsrPhyMode phyMode,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs *pIes)
{
int i;
@ -4447,7 +4447,7 @@ static void csr_set_cfg_rate_set(struct mac_context *mac, eCsrPhyMode phyMode,
QDF_ASSERT(pIes);
if (pIes) {
csr_is_phy_mode_match(mac, phyMode, pBssDesc, pProfile,
csr_is_phy_mode_match(mac, phyMode, bss_desc, pProfile,
&cfgDot11Mode, pIes);
/* Originally, we thought that for 11a networks, the 11a rates
* are always in the Operational Rate set & for 11b and 11g
@ -4654,7 +4654,7 @@ static void csr_roam_ccm_cfg_set_callback(struct mac_context *mac,
/* pIes may be NULL */
QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t sessionId,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
struct bss_config_param *pBssConfig,
struct sDot11fBeaconIEs *pIes,
bool resetCountry)
@ -4670,11 +4670,11 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
/* Make sure we have the domain info for the BSS we try to connect to.
* Do we need to worry about sequence for OSs that are not Windows??
*/
if (pBssDesc) {
if (bss_desc) {
if ((QDF_SAP_MODE !=
csr_get_session_persona(mac, sessionId)) &&
csr_learn_11dcountry_information(
mac, pBssDesc, pIes, true)) {
mac, bss_desc, pIes, true)) {
csr_apply_country_information(mac);
}
if ((wlan_reg_11d_enabled_on_host(mac->psoc)) && pIes) {
@ -4706,8 +4706,8 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
if (CSR_IS_INFRA_AP(pProfile) || CSR_IS_IBSS(pProfile))
channel = pProfile->operationChannel;
else if (pBssDesc)
channel = pBssDesc->channelId;
else if (bss_desc)
channel = bss_desc->channelId;
if (0 != channel) {
/* for now if we are on 2.4 Ghz, CB will be always disabled */
if (WLAN_REG_IS_24GHZ_CH(channel))
@ -4717,9 +4717,9 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
}
/* Rate */
/* Fixed Rate */
if (pBssDesc)
if (bss_desc)
csr_set_cfg_rate_set(mac, (eCsrPhyMode) pProfile->phyMode,
pProfile, pBssDesc, pIes);
pProfile, bss_desc, pIes);
else
csr_set_cfg_rate_set_from_profile(mac, pProfile);
@ -4744,7 +4744,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(struct mac_context *mac, uint32_t session
static
QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
struct csr_roam_profile *roam_profile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs *pIes)
{
QDF_STATUS status;
@ -4762,7 +4762,7 @@ QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
sme_debug("session id: %d", sessionId);
status = csr_roam_prepare_bss_config(mac, roam_profile, pBssDesc,
status = csr_roam_prepare_bss_config(mac, roam_profile, bss_desc,
pBssConfig, pIes);
if (QDF_IS_STATUS_SUCCESS(status)) {
enum csr_roam_substate substate;
@ -4775,7 +4775,7 @@ QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
if (csr_is_bss_type_ibss(roam_profile->BSSType) ||
CSR_IS_INFRA_AP(roam_profile))
csr_roam_prepare_bss_params(mac, sessionId,
roam_profile, pBssDesc,
roam_profile, bss_desc,
pBssConfig, pIes);
/*
* If we are in an IBSS, then stop the IBSS...
@ -4791,13 +4791,13 @@ QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
* (roaming to a new SSID)...
* Not worry about WDS connection for now
*/
if (pBssDesc &&
(csr_is_ibss_bss_desc(pBssDesc) ||
if (bss_desc &&
(csr_is_ibss_bss_desc(bss_desc) ||
!csr_is_ssid_equal(mac, pSession->pConnectBssDesc,
pBssDesc, pIes)))
bss_desc, pIes)))
status = csr_roam_issue_disassociate(mac,
sessionId, substate, false);
else if (pBssDesc)
else if (bss_desc)
/*
* In an infra & going to an infra network with
* the same SSID. This calls for a reassoc seq.
@ -4806,9 +4806,9 @@ QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
*/
status = csr_roam_set_bss_config_cfg(
mac, sessionId, roam_profile,
pBssDesc, pBssConfig, pIes,
bss_desc, pBssConfig, pIes,
false);
} else if (pBssDesc || CSR_IS_INFRA_AP(roam_profile)) {
} else if (bss_desc || CSR_IS_INFRA_AP(roam_profile)) {
/*
* Neither in IBSS nor in Infra. We can go ahead and set
* the cfg for tne new network... nothing to stop.
@ -4819,7 +4819,7 @@ QDF_STATUS csr_roam_stop_network(struct mac_context *mac, uint32_t sessionId,
/* Set parameters for this Bss. */
status = csr_roam_set_bss_config_cfg(mac, sessionId,
roam_profile,
pBssDesc,
bss_desc,
pBssConfig, pIes,
is_11r_roaming);
}
@ -4879,7 +4879,7 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
struct csr_roam_profile *pProfile)
{
enum csr_join_state eRoamState = eCsrContinueRoaming;
struct bss_description *pBssDesc = &pScanResult->BssDescriptor;
struct bss_description *bss_desc = &pScanResult->BssDescriptor;
tDot11fBeaconIEs *pIesLocal = (tDot11fBeaconIEs *) (pScanResult->pvIes);
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@ -4890,11 +4890,11 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
if (!pIesLocal &&
!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(mac,
pBssDesc, &pIesLocal))) {
bss_desc, &pIesLocal))) {
sme_err("fail to parse IEs");
return eCsrStopRoaming;
}
if (csr_is_infra_bss_desc(pBssDesc)) {
if (csr_is_infra_bss_desc(bss_desc)) {
/*
* If we are connected in infra mode and the join bss descr is
* for the same BssID, then we are attempting to join the AP we
@ -4904,10 +4904,10 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
*/
if (csr_is_conn_state_connected_infra(mac, sessionId) &&
csr_is_bss_id_equal(pBssDesc,
csr_is_bss_id_equal(bss_desc,
pSession->pConnectBssDesc) &&
csr_is_ssid_equal(mac, pSession->pConnectBssDesc,
pBssDesc, pIesLocal)) {
bss_desc, pIesLocal)) {
/*
* Check to see if the Auth type has changed in the
* profile. If so, we don't want to reassociate with
@ -4922,7 +4922,7 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
eRoamState =
csr_roam_state_for_same_profile(mac,
pProfile, pSession, sessionId,
pIesLocal, pBssDesc);
pIesLocal, bss_desc);
} else if (!QDF_IS_STATUS_SUCCESS(
csr_roam_issue_disassociate(
mac,
@ -4934,7 +4934,7 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
eRoamState = eCsrStopRoaming;
}
} else if (!QDF_IS_STATUS_SUCCESS(csr_roam_stop_network(mac,
sessionId, pProfile, pBssDesc, pIesLocal)))
sessionId, pProfile, bss_desc, pIesLocal)))
/* we used to pre-auth here with open auth
* networks but that wasn't working so well.
* stop the existing network before attempting
@ -4942,7 +4942,7 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
*/
eRoamState = eCsrStopRoaming;
} else if (!QDF_IS_STATUS_SUCCESS(csr_roam_stop_network(mac, sessionId,
pProfile, pBssDesc,
pProfile, bss_desc,
pIesLocal)))
eRoamState = eCsrStopRoaming;
@ -4953,7 +4953,7 @@ static enum csr_join_state csr_roam_join(struct mac_context *mac,
static QDF_STATUS
csr_roam_should_roam(struct mac_context *mac, uint32_t sessionId,
struct bss_description *pBssDesc, uint32_t roamId)
struct bss_description *bss_desc, uint32_t roamId)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct csr_roam_info *roam_info;
@ -4961,7 +4961,7 @@ csr_roam_should_roam(struct mac_context *mac, uint32_t sessionId,
roam_info = qdf_mem_malloc(sizeof(*roam_info));
if (!roam_info)
return QDF_STATUS_E_NOMEM;
roam_info->pBssDesc = pBssDesc;
roam_info->bss_desc = bss_desc;
status = csr_roam_call_callback(mac, sessionId, roam_info, roamId,
eCSR_ROAM_SHOULD_ROAM,
eCSR_ROAM_RESULT_NONE);
@ -5177,8 +5177,8 @@ static void csr_roam_join_handle_profile(struct mac_context *mac_ctx,
*roam_state = eCsrStopRoaming;
return;
}
roam_info_ptr->pBssDesc = &result->BssDescriptor;
cmd->u.roamCmd.pLastRoamBss = roam_info_ptr->pBssDesc;
roam_info_ptr->bss_desc = &result->BssDescriptor;
cmd->u.roamCmd.pLastRoamBss = roam_info_ptr->bss_desc;
/* dont put uapsd_mask if BSS doesn't support uAPSD */
if (scan_result && cmd->u.roamCmd.roamProfile.uapsd_mask
&& CSR_IS_QOS_BSS(ies_local)
@ -5347,7 +5347,7 @@ static enum csr_join_state csr_roam_join_next_bss(struct mac_context *mac_ctx,
* We need to indicate to HDD that we
* are done with this one.
*/
roam_info->pBssDesc = cmd->u.roamCmd.pLastRoamBss;
roam_info->bss_desc = cmd->u.roamCmd.pLastRoamBss;
join_status = &session->joinFailStatusCode;
roam_info->statusCode = join_status->statusCode;
roam_info->reasonCode = join_status->reasonCode;
@ -5473,7 +5473,7 @@ QDF_STATUS csr_process_ft_reassoc_roam_command(struct mac_context *mac,
uint32_t sessionId;
struct csr_roam_session *pSession;
struct tag_csrscan_result *pScanResult = NULL;
struct bss_description *pBssDesc = NULL;
struct bss_description *bss_desc = NULL;
QDF_STATUS status = QDF_STATUS_SUCCESS;
sessionId = pCommand->sessionId;
@ -5494,14 +5494,14 @@ QDF_STATUS csr_process_ft_reassoc_roam_command(struct mac_context *mac,
pScanResult =
GET_BASE_ADDR(pCommand->u.roamCmd.pRoamBssEntry,
struct tag_csrscan_result, Link);
pBssDesc = &pScanResult->Result.BssDescriptor;
bss_desc = &pScanResult->Result.BssDescriptor;
} else {
/* the roaming is cancelled. Simply complete the command */
sme_debug("Roam command canceled");
csr_roam_complete(mac, eCsrNothingToJoin, NULL, sessionId);
return QDF_STATUS_E_FAILURE;
}
status = csr_roam_issue_reassociate(mac, sessionId, pBssDesc,
status = csr_roam_issue_reassociate(mac, sessionId, bss_desc,
(tDot11fBeaconIEs *) (pScanResult->
Result.pvIes),
&pCommand->u.roamCmd.roamProfile);
@ -5544,7 +5544,7 @@ csr_roam_trigger_reassociate(struct mac_context *mac_ctx, tSmeCmd *cmd,
roam_info, 0, eCSR_ROAM_ROAMING_START,
eCSR_ROAM_RESULT_NONE);
session_ptr->roamingReason = eCsrReassocRoaming;
roam_info->pBssDesc = session_ptr->pConnectBssDesc;
roam_info->bss_desc = session_ptr->pConnectBssDesc;
roam_info->pProfile = &cmd->u.roamCmd.roamProfile;
session_ptr->bRefAssocStartCnt++;
csr_roam_call_callback(mac_ctx, session_id, roam_info,
@ -6339,7 +6339,7 @@ static void csr_roam_process_results_default(struct mac_context *mac_ctx,
case eCsrSmeIssuedDisassocForHandoff:
csr_roam_state_change(mac_ctx, eCSR_ROAMING_STATE_IDLE,
session_id);
roam_info->pBssDesc = cmd->u.roamCmd.pLastRoamBss;
roam_info->bss_desc = cmd->u.roamCmd.pLastRoamBss;
roam_info->pProfile = &cmd->u.roamCmd.roamProfile;
roam_info->statusCode = session->joinFailStatusCode.statusCode;
roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
@ -6568,7 +6568,7 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
(csr_get_parsed_bss_description_ies(mac_ctx, bss_desc,
&ies_ptr))) {
sme_warn("cannot parse IBSS IEs");
roam_info->pBssDesc = bss_desc;
roam_info->bss_desc = bss_desc;
csr_roam_call_callback(mac_ctx, session_id, roam_info,
cmd->u.roamCmd.roamId,
eCSR_ROAM_IBSS_IND,
@ -6685,7 +6685,7 @@ static void csr_roam_process_start_bss_success(struct mac_context *mac_ctx,
roam_info->statusCode = session->joinFailStatusCode.statusCode;
roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
/* We start the IBSS (didn't find any matched IBSS out there) */
roam_info->pBssDesc = bss_desc;
roam_info->bss_desc = bss_desc;
if (bss_desc)
qdf_mem_copy(roam_info->bssid.bytes, bss_desc->bssId,
sizeof(struct qdf_mac_addr));
@ -7086,7 +7086,7 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
}
}
assoc_info.pBssDesc = bss_desc; /* could be NULL */
assoc_info.bss_desc = bss_desc; /* could be NULL */
assoc_info.pProfile = profile;
if (context) {
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
@ -7202,7 +7202,7 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
sme_qos_csr_event_ind(mac_ctx, (uint8_t) session_id, ind_qos,
&assoc_info);
#endif
roam_info->pBssDesc = bss_desc;
roam_info->bss_desc = bss_desc;
roam_info->statusCode =
session->joinFailStatusCode.statusCode;
roam_info->reasonCode =
@ -7340,7 +7340,7 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
bss_desc = (struct bss_description *) context;
else
bss_desc = NULL;
roam_info->pBssDesc = bss_desc;
roam_info->bss_desc = bss_desc;
csr_roam_call_callback(mac_ctx, session_id, roam_info,
cmd->u.roamCmd.roamId, roam_status,
roam_result);
@ -7357,10 +7357,10 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_NONE,
session_id);
qdf_mem_zero(roam_info, sizeof(*roam_info));
roam_info->pBssDesc = session->pConnectBssDesc;
if (roam_info->pBssDesc)
roam_info->bss_desc = session->pConnectBssDesc;
if (roam_info->bss_desc)
qdf_mem_copy(&roam_info->bssid,
&roam_info->pBssDesc->bssId,
&roam_info->bss_desc->bssId,
sizeof(struct qdf_mac_addr));
/*
* Since there is no change in the current state, simply pass
@ -7384,10 +7384,10 @@ static bool csr_roam_process_results(struct mac_context *mac_ctx, tSmeCmd *cmd,
* No need to change substate to wai_for_key because there
* is no state change
*/
roam_info->pBssDesc = session->pConnectBssDesc;
if (roam_info->pBssDesc)
roam_info->bss_desc = session->pConnectBssDesc;
if (roam_info->bss_desc)
qdf_mem_copy(&roam_info->bssid,
&roam_info->pBssDesc->bssId,
&roam_info->bss_desc->bssId,
sizeof(struct qdf_mac_addr));
roam_info->statusCode = session->joinFailStatusCode.statusCode;
roam_info->reasonCode = session->joinFailStatusCode.reasonCode;
@ -8950,7 +8950,7 @@ csr_roam_reissue_roam_command(struct mac_context *mac, uint8_t session_id)
roam_info = qdf_mem_malloc(sizeof(*roam_info));
if (!roam_info)
return;
roam_info->pBssDesc = pCommand->u.roamCmd.pLastRoamBss;
roam_info->bss_desc = pCommand->u.roamCmd.pLastRoamBss;
roam_info->statusCode = pSession->joinFailStatusCode.statusCode;
roam_info->reasonCode = pSession->joinFailStatusCode.reasonCode;
pSession->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTED;
@ -12105,13 +12105,13 @@ csr_roam_chk_lnk_ibss_new_peer_ind(struct mac_context *mac_ctx, tSirSmeRsp *msg_
roam_info->nBeaconLength);
}
roam_info->staId = (uint8_t)pIbssPeerInd->staId;
roam_info->pBssDesc = qdf_mem_malloc(
roam_info->bss_desc = qdf_mem_malloc(
session->pConnectBssDesc->length);
if (!roam_info->pBssDesc) {
if (!roam_info->bss_desc) {
status = QDF_STATUS_E_NOMEM;
} else {
status = QDF_STATUS_SUCCESS;
qdf_mem_copy(roam_info->pBssDesc,
qdf_mem_copy(roam_info->bss_desc,
session->pConnectBssDesc,
session->pConnectBssDesc->length);
}
@ -12135,7 +12135,7 @@ callback_and_free:
eCSR_ROAM_RESULT_IBSS_NEW_PEER);
if (roam_info) {
qdf_mem_free(roam_info->pbFrames);
qdf_mem_free(roam_info->pBssDesc);
qdf_mem_free(roam_info->bss_desc);
qdf_mem_free(roam_info);
}
}
@ -14027,7 +14027,7 @@ csr_roam_get_bss_start_parms(struct mac_context *mac,
static void
csr_roam_get_bss_start_parms_from_bss_desc(
struct mac_context *mac,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs *pIes,
struct csr_roamstart_bssparams *pParam)
{
@ -14036,10 +14036,10 @@ csr_roam_get_bss_start_parms_from_bss_desc(
return;
}
pParam->sirNwType = pBssDesc->nwType;
pParam->sirNwType = bss_desc->nwType;
pParam->cbMode = PHY_SINGLE_CHANNEL_CENTERED;
pParam->operationChn = pBssDesc->channelId;
qdf_mem_copy(&pParam->bssid, pBssDesc->bssId,
pParam->operationChn = bss_desc->channelId;
qdf_mem_copy(&pParam->bssid, bss_desc->bssId,
sizeof(struct qdf_mac_addr));
if (!pIes) {
@ -14108,7 +14108,7 @@ static void csr_roam_determine_max_rate_for_ad_hoc(struct mac_context *mac,
QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
struct csr_roamstart_bssparams *pParam,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
uint32_t roamId)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
@ -14124,11 +14124,12 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
WLAN_HOST_DIAG_LOG_ALLOC(pIbssLog, host_log_ibss_pkt_type,
LOG_WLAN_IBSS_C);
if (pIbssLog) {
if (pBssDesc) {
if (bss_desc) {
pIbssLog->eventId =
WLAN_IBSS_EVENT_JOIN_IBSS_REQ;
qdf_mem_copy(pIbssLog->bssid.bytes,
pBssDesc->bssId, QDF_MAC_ADDR_SIZE);
bss_desc->bssId,
QDF_MAC_ADDR_SIZE);
} else
pIbssLog->eventId =
WLAN_IBSS_EVENT_START_IBSS_REQ;
@ -14215,13 +14216,13 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
/* When starting an IBSS, start on the channel from the Profile. */
status = csr_send_mb_start_bss_req_msg(mac, sessionId,
pProfile->BSSType, pParam,
pBssDesc);
bss_desc);
return status;
}
void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
struct bss_config_param *pBssConfig,
tDot11fBeaconIEs *pIes)
{
@ -14235,9 +14236,9 @@ void csr_roam_prepare_bss_params(struct mac_context *mac, uint32_t sessionId,
return;
}
if (pBssDesc) {
csr_roam_get_bss_start_parms_from_bss_desc(mac, pBssDesc, pIes,
&pSession->bssParams);
if (bss_desc) {
csr_roam_get_bss_start_parms_from_bss_desc(mac, bss_desc, pIes,
&pSession->bssParams);
if (CSR_IS_NDI(pProfile)) {
qdf_copy_macaddr(&pSession->bssParams.bssid,
&pSession->selfMacAddr);
@ -14759,7 +14760,7 @@ eRoamCmdStatus csr_get_roam_complete_status(struct mac_context *mac,
static QDF_STATUS csr_roam_start_wds(struct mac_context *mac, uint32_t sessionId,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
@ -14801,7 +14802,7 @@ static QDF_STATUS csr_roam_start_wds(struct mac_context *mac, uint32_t sessionId
status = csr_roam_prepare_bss_config_from_profile(mac,
pProfile,
&bssConfig,
pBssDesc);
bss_desc);
if (QDF_IS_STATUS_SUCCESS(status)) {
/* Save profile for late use */
csr_free_roam_profile(mac, sessionId);
@ -16533,7 +16534,7 @@ QDF_STATUS csr_send_mb_set_context_req_msg(struct mac_context *mac,
QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
sessionId, eCsrRoamBssType bssType,
struct csr_roamstart_bssparams *pParam,
struct bss_description *pBssDesc)
struct bss_description *bss_desc)
{
struct start_bss_req *pMsg;
uint16_t wTmp;
@ -16558,8 +16559,8 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
/* selfMacAddr */
qdf_copy_macaddr(&pMsg->self_macaddr, &pSession->selfMacAddr);
/* beaconInterval */
if (pBssDesc && pBssDesc->beaconInterval)
wTmp = pBssDesc->beaconInterval;
if (bss_desc && bss_desc->beaconInterval)
wTmp = bss_desc->beaconInterval;
else if (pParam->beaconInterval)
wTmp = pParam->beaconInterval;
else
@ -21936,7 +21937,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
csr_roam_copy_ht_profile(dst_profile,
src_profile);
#endif
assoc_info.pBssDesc = bss_desc;
assoc_info.bss_desc = bss_desc;
roam_info->statusCode = eSIR_SME_SUCCESS;
roam_info->reasonCode = eSIR_SME_SUCCESS;
assoc_info.pProfile = session->pCurRoamProfile;
@ -21952,7 +21953,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED;
sme_qos_csr_event_ind(mac_ctx, session_id,
SME_QOS_CSR_REASSOC_COMPLETE, &assoc_info);
roam_info->pBssDesc = bss_desc;
roam_info->bss_desc = bss_desc;
conn_profile->acm_mask = sme_qos_get_acm_mask(mac_ctx,
bss_desc, NULL);
if (conn_profile->modifyProfileFields.uapsd_mask) {

10
core/sme/src/csr/csr_api_scan.c
View file

@ -82,12 +82,12 @@ static QDF_STATUS csr_ll_scan_purge_result(struct mac_context *mac,
{
QDF_STATUS status = QDF_STATUS_SUCCESS;
tListElem *pEntry;
struct tag_csrscan_result *pBssDesc;
struct tag_csrscan_result *bss_desc;
while ((pEntry = csr_ll_remove_head(pList, LL_ACCESS_NOLOCK)) != NULL) {
pBssDesc = GET_BASE_ADDR(pEntry, struct tag_csrscan_result,
Link);
csr_free_scan_result_entry(mac, pBssDesc);
bss_desc = GET_BASE_ADDR(pEntry, struct tag_csrscan_result,
Link);
csr_free_scan_result_entry(mac, bss_desc);
}
return status;
@ -285,7 +285,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid_failure(struct mac_context *mac_ctx,
if (session->scan_info.roambssentry) {
scan_result = GET_BASE_ADDR(session->scan_info.roambssentry,
struct tag_csrscan_result, Link);
roam_info->pBssDesc = &scan_result->Result.BssDescriptor;
roam_info->bss_desc = &scan_result->Result.BssDescriptor;
}
roam_info->statusCode = session->joinFailStatusCode.statusCode;
roam_info->reasonCode = session->joinFailStatusCode.reasonCode;

6
core/sme/src/csr/csr_inside_api.h
View file

@ -154,7 +154,7 @@ void csr_release_command_wm_status_change(struct mac_context *mac,
QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
uint32_t sessionId,
struct bss_description *pBssDesc);
struct bss_description *bss_desc);
/*
* Prepare a filter base on a profile for parsing the scan results.
@ -257,7 +257,7 @@ static inline void csr_roam_stats_rsp_processor(struct mac_context *mac,
QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
struct csr_roamstart_bssparams *pParam,
struct csr_roam_profile *pProfile,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
uint32_t roamId);
QDF_STATUS csr_roam_issue_stop_bss(struct mac_context *mac, uint32_t sessionId,
enum csr_roam_substate NewSubstate);
@ -298,7 +298,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac,
uint32_t sessionId,
eCsrRoamBssType bssType,
struct csr_roamstart_bssparams *pParam,
struct bss_description *pBssDesc);
struct bss_description *bss_desc);
QDF_STATUS csr_send_mb_stop_bss_req_msg(struct mac_context *mac,
uint32_t sessionId);

22
core/sme/src/csr/csr_neighbor_roam.c
View file

@ -632,7 +632,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(struct mac_context *mac,
* csr_neighbor_roam_is_ssid_and_security_match() - to match ssid/security
* @mac: Pointer to mac context
* @pCurProfile: pointer to current roam profile
* @pBssDesc: pointer to bss description
* @bss_desc: pointer to bss description
* @pIes: pointer to local ies
* @session_id: Session ID
*
@ -643,7 +643,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(struct mac_context *mac,
*/
static bool csr_neighbor_roam_is_ssid_and_security_match(struct mac_context *mac,
tCsrRoamConnectedProfile *pCurProfile,
struct bss_description *pBssDesc, tDot11fBeaconIEs *pIes,
struct bss_description *bss_desc, tDot11fBeaconIEs *pIes,
uint8_t session_id)
{
tCsrAuthList authType;
@ -686,12 +686,12 @@ static bool csr_neighbor_roam_is_ssid_and_security_match(struct mac_context *mac
&pCurProfile->MFPEnabled,
&pCurProfile->MFPRequired,
&pCurProfile->MFPCapable,
pBssDesc, pIes, session_id);
bss_desc, pIes, session_id);
#else
fMatch = csr_is_security_match(mac, &authType,
&uCEncryptionType,
&mCEncryptionType, NULL,
NULL, NULL, pBssDesc,
NULL, NULL, bss_desc,
pIes, session_id);
#endif
return fMatch;
@ -709,7 +709,7 @@ bool csr_neighbor_roam_is_new_connected_profile(struct mac_context *mac,
tCsrRoamConnectedProfile *pCurrProfile = NULL;
tCsrRoamConnectedProfile *pPrevProfile = NULL;
tDot11fBeaconIEs *pIes = NULL;
struct bss_description *pBssDesc = NULL;
struct bss_description *bss_desc = NULL;
bool fNew = true;
if (!(mac->roam.roamSession && CSR_IS_SESSION_VALID(mac, sessionId)))
@ -723,12 +723,12 @@ bool csr_neighbor_roam_is_new_connected_profile(struct mac_context *mac,
if (!pPrevProfile)
return fNew;
pBssDesc = pPrevProfile->pBssDesc;
if (pBssDesc) {
bss_desc = pPrevProfile->bss_desc;
if (bss_desc) {
if (QDF_IS_STATUS_SUCCESS(
csr_get_parsed_bss_description_ies(mac, pBssDesc, &pIes))
csr_get_parsed_bss_description_ies(mac, bss_desc, &pIes))
&& csr_neighbor_roam_is_ssid_and_security_match(mac,
pCurrProfile, pBssDesc, pIes, sessionId)) {
pCurrProfile, bss_desc, pIes, sessionId)) {
fNew = false;
}
if (pIes)
@ -747,7 +747,7 @@ bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
tDot11fBeaconIEs *pIes)
{
tCsrRoamConnectedProfile *pCurProfile = NULL;
struct bss_description *pBssDesc = &pResult->Result.BssDescriptor;
struct bss_description *bss_desc = &pResult->Result.BssDescriptor;
if (!(mac->roam.roamSession && CSR_IS_SESSION_VALID(mac, sessionId)))
return false;
@ -758,7 +758,7 @@ bool csr_neighbor_roam_connected_profile_match(struct mac_context *mac,
return false;
return csr_neighbor_roam_is_ssid_and_security_match(mac, pCurProfile,
pBssDesc, pIes,
bss_desc, pIes,
sessionId);
}

12
core/sme/src/csr/csr_util.c
View file

@ -1418,17 +1418,17 @@ csr_get_qos_from_bss_desc(struct mac_context *mac_ctx,
/* Caller allocates memory for pIEStruct */
QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs *pIEStruct)
{
QDF_STATUS status = QDF_STATUS_E_FAILURE;
int ieLen =
(int)(pBssDesc->length + sizeof(pBssDesc->length) -
(int)(bss_desc->length + sizeof(bss_desc->length) -
GET_FIELD_OFFSET(struct bss_description, ieFields));
if (ieLen > 0 && pIEStruct) {
if (!DOT11F_FAILED(dot11f_unpack_beacon_i_es
(mac_ctx, (uint8_t *) pBssDesc->ieFields,
(mac_ctx, (uint8_t *)bss_desc->ieFields,
ieLen, pIEStruct, false)))
status = QDF_STATUS_SUCCESS;
}
@ -1441,16 +1441,16 @@ QDF_STATUS csr_parse_bss_description_ies(struct mac_context *mac_ctx,
* this function succeeds
*/
QDF_STATUS csr_get_parsed_bss_description_ies(struct mac_context *mac_ctx,
struct bss_description *pBssDesc,
struct bss_description *bss_desc,
tDot11fBeaconIEs **ppIEStruct)
{
QDF_STATUS status = QDF_STATUS_E_INVAL;
if (pBssDesc && ppIEStruct) {
if (bss_desc && ppIEStruct) {
*ppIEStruct = qdf_mem_malloc(sizeof(tDot11fBeaconIEs));
if ((*ppIEStruct) != NULL) {
status = csr_parse_bss_description_ies(mac_ctx,
pBssDesc,
bss_desc,
*ppIEStruct);
if (!QDF_IS_STATUS_SUCCESS(status)) {
qdf_mem_free(*ppIEStruct);

80
core/sme/src/qos/sme_qos.c
View file

@ -617,9 +617,9 @@ QDF_STATUS sme_qos_close(struct mac_context *mac)
sme_qos_delete_existing_flows(mac, sessionId);
/* Clean up the assoc info if already allocated */
if (pSession->assocInfo.pBssDesc) {
qdf_mem_free(pSession->assocInfo.pBssDesc);
pSession->assocInfo.pBssDesc = NULL;
if (pSession->assocInfo.bss_desc) {
qdf_mem_free(pSession->assocInfo.bss_desc);
pSession->assocInfo.bss_desc = NULL;
}
/* close the session's buffered command list */
csr_ll_close(&pSession->bufferedCommandList);
@ -1258,8 +1258,8 @@ static enum sme_qos_statustype sme_qos_internal_setup_req(struct mac_context *ma
* needed on ACM = 0 below?
*/
if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(mac) ||
sme_qos_is_acm(mac, pSession->assocInfo.pBssDesc,
ac, NULL)) {
sme_qos_is_acm(mac, pSession->assocInfo.bss_desc,
ac, NULL)) {
QDF_TRACE(QDF_MODULE_ID_SME,
QDF_TRACE_LEVEL_DEBUG,
"%s: %d: tspec_mask_status = %d for AC = %d",
@ -2350,8 +2350,8 @@ static enum sme_qos_statustype sme_qos_internal_release_req(struct mac_context *
status = SME_QOS_STATUS_RELEASE_SUCCESS_RSP;
/* check if delts needs to be sent */
if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(mac) ||
sme_qos_is_acm(mac, pSession->assocInfo.pBssDesc,
ac, NULL)) {
sme_qos_is_acm(mac, pSession->assocInfo.bss_desc,
ac, NULL)) {
/* check if other TSPEC for this AC is also
* in use
*/
@ -2642,14 +2642,14 @@ static enum sme_qos_statustype sme_qos_setup(struct mac_context *mac,
__func__, __LINE__, sessionId);
return status;
}
if (!pSession->assocInfo.pBssDesc) {
if (!pSession->assocInfo.bss_desc) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Session %d has an Invalid BSS Descriptor",
__func__, __LINE__, sessionId);
return status;
}
hstatus = csr_get_parsed_bss_description_ies(mac,
pSession->assocInfo.pBssDesc,
pSession->assocInfo.bss_desc,
&pIes);
if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@ -2677,7 +2677,7 @@ static enum sme_qos_statustype sme_qos_setup(struct mac_context *mac,
do {
/* is ACM enabled for this AC? */
if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(mac) ||
sme_qos_is_acm(mac, pSession->assocInfo.pBssDesc,
sme_qos_is_acm(mac, pSession->assocInfo.bss_desc,
ac, NULL)) {
/* ACM is enabled for this AC so we must send an
* AddTS
@ -3424,7 +3424,7 @@ static QDF_STATUS sme_qos_ft_aggr_qos_req(struct mac_context *mac_ctx, uint8_t
aggr_req->timeout = 0;
aggr_req->rspReqd = true;
qdf_mem_copy(&aggr_req->bssid.bytes[0],
&session->assocInfo.pBssDesc->bssId[0],
&session->assocInfo.bss_desc->bssId[0],
sizeof(struct qdf_mac_addr));
for (i = 0; i < QCA_WLAN_AC_ALL; i++) {
@ -3906,7 +3906,7 @@ static QDF_STATUS sme_qos_add_ts_req(struct mac_context *mac,
pTspec_Info->ts_info.ack_policy;
pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE;
/*Fill the BSSID pMsg->req.bssId */
if (!pSession->assocInfo.pBssDesc) {
if (!pSession->assocInfo.bss_desc) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: BSS descriptor is NULL so we don't send request to PE",
__func__, __LINE__);
@ -3914,7 +3914,7 @@ static QDF_STATUS sme_qos_add_ts_req(struct mac_context *mac,
return QDF_STATUS_E_FAILURE;
}
qdf_mem_copy(&pMsg->bssid.bytes[0],
&pSession->assocInfo.pBssDesc->bssId[0],
&pSession->assocInfo.bss_desc->bssId[0],
sizeof(struct qdf_mac_addr));
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
"%s: %d: up = %d, tid = %d",
@ -4007,7 +4007,7 @@ static QDF_STATUS sme_qos_del_ts_req(struct mac_context *mac,
pTspecInfo->ts_info.ack_policy;
pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE;
/*Fill the BSSID pMsg->req.bssId */
if (!pSession->assocInfo.pBssDesc) {
if (!pSession->assocInfo.bss_desc) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: BSS descriptor is NULL so we don't send request to PE",
__func__, __LINE__);
@ -4015,7 +4015,7 @@ static QDF_STATUS sme_qos_del_ts_req(struct mac_context *mac,
return QDF_STATUS_E_FAILURE;
}
qdf_mem_copy(&pMsg->bssid.bytes[0],
&pSession->assocInfo.pBssDesc->bssId[0],
&pSession->assocInfo.bss_desc->bssId[0],
sizeof(struct qdf_mac_addr));
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
@ -4240,19 +4240,19 @@ static QDF_STATUS sme_qos_process_assoc_complete_ev(struct mac_context *mac, uin
__func__, __LINE__);
return status;
}
if (!((sme_QosAssocInfo *) pEvent_info)->pBssDesc) {
if (!((sme_QosAssocInfo *)pEvent_info)->bss_desc) {
/* err msg */
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: pBssDesc is NULL",
"%s: %d: bss_desc is NULL",
__func__, __LINE__);
return status;
}
if ((pSession->assocInfo.pBssDesc) &&
if ((pSession->assocInfo.bss_desc) &&
(csr_is_bssid_match
((struct qdf_mac_addr *)
&pSession->assocInfo.pBssDesc->bssId,
&pSession->assocInfo.bss_desc->bssId,
(struct qdf_mac_addr *) &(((sme_QosAssocInfo *)
pEvent_info)->pBssDesc->bssId)))) {
pEvent_info)->bss_desc->bssId)))) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: assoc with the same BSS, no update needed",
__func__, __LINE__);
@ -4575,9 +4575,9 @@ static QDF_STATUS sme_qos_process_reassoc_success_ev(struct mac_context *mac_ctx
return status;
}
if (!((sme_QosAssocInfo *) event_info)->pBssDesc) {
if (!((sme_QosAssocInfo *)event_info)->bss_desc) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
FL("pBssDesc is NULL"));
FL("bss_desc is NULL"));
return status;
}
status = sme_qos_save_assoc_info(qos_session, event_info);
@ -4897,9 +4897,9 @@ static QDF_STATUS sme_qos_process_disconnect_ev(struct mac_context *mac, uint8_t
/* need to clean up flows */
sme_qos_delete_existing_flows(mac, sessionId);
/* clean up the assoc info */
if (pSession->assocInfo.pBssDesc) {
qdf_mem_free(pSession->assocInfo.pBssDesc);
pSession->assocInfo.pBssDesc = NULL;
if (pSession->assocInfo.bss_desc) {
qdf_mem_free(pSession->assocInfo.bss_desc);
pSession->assocInfo.bss_desc = NULL;
}
sme_qos_cb.sessionInfo[sessionId].sessionActive = false;
return QDF_STATUS_SUCCESS;
@ -4947,9 +4947,9 @@ static QDF_STATUS sme_qos_process_join_req_ev(struct mac_context *mac, uint8_t
sme_qos_state_transition(sessionId, ac, SME_QOS_INIT);
/* clean up the assoc info if already set */
if (pSession->assocInfo.pBssDesc) {
qdf_mem_free(pSession->assocInfo.pBssDesc);
pSession->assocInfo.pBssDesc = NULL;
if (pSession->assocInfo.bss_desc) {
qdf_mem_free(pSession->assocInfo.bss_desc);
pSession->assocInfo.bss_desc = NULL;
}
return QDF_STATUS_SUCCESS;
}
@ -6382,7 +6382,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(struct mac_context *mac,
static QDF_STATUS sme_qos_save_assoc_info(struct sme_qos_sessioninfo *pSession,
sme_QosAssocInfo *pAssoc_info)
{
struct bss_description *pBssDesc = NULL;
struct bss_description *bss_desc = NULL;
uint32_t bssLen = 0;
if (!pAssoc_info) {
@ -6391,19 +6391,19 @@ static QDF_STATUS sme_qos_save_assoc_info(struct sme_qos_sessioninfo *pSession,
return QDF_STATUS_E_FAILURE;
}
/* clean up the assoc info if already set */
if (pSession->assocInfo.pBssDesc) {
qdf_mem_free(pSession->assocInfo.pBssDesc);
pSession->assocInfo.pBssDesc = NULL;
if (pSession->assocInfo.bss_desc) {
qdf_mem_free(pSession->assocInfo.bss_desc);
pSession->assocInfo.bss_desc = NULL;
}
bssLen = pAssoc_info->pBssDesc->length +
sizeof(pAssoc_info->pBssDesc->length);
bssLen = pAssoc_info->bss_desc->length +
sizeof(pAssoc_info->bss_desc->length);
/* save the bss Descriptor */
pBssDesc = qdf_mem_malloc(bssLen);
if (!pBssDesc)
bss_desc = qdf_mem_malloc(bssLen);
if (!bss_desc)
return QDF_STATUS_E_NOMEM;
qdf_mem_copy(pBssDesc, pAssoc_info->pBssDesc, bssLen);
pSession->assocInfo.pBssDesc = pBssDesc;
qdf_mem_copy(bss_desc, pAssoc_info->bss_desc, bssLen);
pSession->assocInfo.bss_desc = bss_desc;
/* save the apsd info from assoc */
if (pAssoc_info->pProfile)
pSession->apsdMask |= pAssoc_info->pProfile->uapsd_mask;
@ -7185,7 +7185,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(mac_handle_t mac_handle,
return false;
}
if (!pSession->assocInfo.pBssDesc) {
if (!pSession->assocInfo.bss_desc) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
"%s: %d: Session %d has an Invalid BSS Descriptor",
__func__, __LINE__, sessionId);
@ -7193,7 +7193,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(mac_handle_t mac_handle,
}
hstatus = csr_get_parsed_bss_description_ies(mac,
pSession->assocInfo.pBssDesc,
pSession->assocInfo.bss_desc,
&pIes);
if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,

2
core/sme/src/rrm/sme_rrm.c
View file

@ -588,7 +588,7 @@ static QDF_STATUS sme_rrm_send_scan_result(struct mac_context *mac_ctx,
scan_results->timer, rrm_scan_timer);
if ((scan_results->timer >= rrm_scan_timer) ||
(is_conn_bss_found == true)) {
roam_info->pBssDesc = &scan_results->BssDescriptor;
roam_info->bss_desc = &scan_results->BssDescriptor;
csr_roam_call_callback(mac_ctx, session_id, roam_info,
0, eCSR_ROAM_UPDATE_SCAN_RESULT,
eCSR_ROAM_RESULT_NONE);