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-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Cleanup unused params from tpAddStaParams

Browse source 
Many legacy params of tpAddStaParams are unused, thus
cleanup the unused params from tpAddStaParams.

Change-Id: I1be957d2f34d2202bcc1d44e69ad5cba0812c60b
CRs-Fixed: 2530961
This commit is contained in:
Abhishek Singh 2019-09-19 12:55:11 +05:30 • committed by nshrivas
commit 6243a002ea
9 changed files with 48 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

162
core/mac/src/pe/lim/lim_assoc_utils.c
View file

@ -2172,7 +2172,6 @@ lim_add_sta(struct mac_context *mac_ctx,
add_sta_params->wmmEnabled = sta_ds->qosMode;
add_sta_params->listenInterval = sta_ds->mlmStaContext.listenInterval;
add_sta_params->shortPreambleSupported = sta_ds->shortPreambleEnabled;
if (LIM_IS_AP_ROLE(session_entry) &&
(sta_ds->mlmStaContext.subType == LIM_REASSOC)) {
/*
@ -2184,10 +2183,9 @@ lim_add_sta(struct mac_context *mac_ctx,
sta_ds->valid = 0;
sta_ds->mlmStaContext.mlmState = eLIM_MLM_WT_ADD_STA_RSP_STATE;
pe_debug("Assoc ID: %d wmmEnabled: %d listenInterval: %d"
" shortPreambleSupported: %d", add_sta_params->assocId,
add_sta_params->wmmEnabled, add_sta_params->listenInterval,
add_sta_params->shortPreambleSupported);
pe_debug("Assoc ID: %d wmmEnabled: %d listenInterval: %d",
add_sta_params->assocId, add_sta_params->wmmEnabled,
add_sta_params->listenInterval);
/* This will indicate HAL to "allocate" a new STA index */
#ifdef FEATURE_WLAN_TDLS
/*
@ -2208,7 +2206,6 @@ lim_add_sta(struct mac_context *mac_ctx,
add_sta_params->updateSta = update_entry;
add_sta_params->status = QDF_STATUS_SUCCESS;
add_sta_params->respReqd = 1;
/* Update VHT/HT Capability */
if (LIM_IS_AP_ROLE(session_entry) ||
@ -2256,29 +2253,21 @@ lim_add_sta(struct mac_context *mac_ctx,
lim_update_sta_he_capable(mac_ctx, add_sta_params, sta_ds,
session_entry);
add_sta_params->greenFieldCapable = sta_ds->htGreenfield;
add_sta_params->maxAmpduDensity = sta_ds->htAMpduDensity;
add_sta_params->maxAmpduSize = sta_ds->htMaxRxAMpduFactor;
add_sta_params->fDsssCckMode40Mhz = sta_ds->htDsssCckRate40MHzSupport;
add_sta_params->fShortGI20Mhz = sta_ds->htShortGI20Mhz;
add_sta_params->fShortGI40Mhz = sta_ds->htShortGI40Mhz;
add_sta_params->lsigTxopProtection = sta_ds->htLsigTXOPProtection;
add_sta_params->maxAmsduSize = sta_ds->htMaxAmsduLength;
add_sta_params->ch_width = sta_ds->htSupportedChannelWidthSet;
add_sta_params->mimoPS = sta_ds->htMIMOPSState;
pe_debug("greenFieldCapable: %d maxAmpduDensity: %d maxAmpduDensity: %d",
add_sta_params->greenFieldCapable,
add_sta_params->maxAmpduDensity, add_sta_params->maxAmpduSize);
pe_debug("maxAmpduDensity: %d maxAmpduDensity: %d",
add_sta_params->maxAmpduDensity, add_sta_params->maxAmpduSize);
pe_debug("fDsssCckMode40Mhz: %d fShortGI20Mhz: %d fShortGI40Mhz: %d",
add_sta_params->fDsssCckMode40Mhz,
pe_debug("fShortGI20Mhz: %d fShortGI40Mhz: %d",
add_sta_params->fShortGI20Mhz, add_sta_params->fShortGI40Mhz);
pe_debug("lsigTxopProtection: %d maxAmsduSize: %d txChannelWidth: %d mimoPS: %d",
add_sta_params->lsigTxopProtection,
add_sta_params->maxAmsduSize, add_sta_params->ch_width,
add_sta_params->mimoPS);
pe_debug("txChannelWidth: %d mimoPS: %d", add_sta_params->ch_width,
add_sta_params->mimoPS);
if (add_sta_params->vhtCapable) {
if (sta_ds->vhtSupportedChannelWidthSet)
@ -2498,8 +2487,7 @@ lim_add_sta(struct mac_context *mac_ctx,
* we need to defer the message until we get the
* response back from HAL.
*/
if (add_sta_params->respReqd)
SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, false);
SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, false);
add_sta_params->nwType = session_entry->nwType;
@ -2547,8 +2535,7 @@ lim_add_sta(struct mac_context *mac_ctx,
ret_code = wma_post_ctrl_msg(mac_ctx, &msg_q);
if (QDF_STATUS_SUCCESS != ret_code) {
if (add_sta_params->respReqd)
SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, true);
SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, true);
pe_err("ADD_STA_REQ for aId %d failed (reason %X)",
sta_ds->assocId, ret_code);
qdf_mem_free(add_sta_params);
@ -2777,7 +2764,6 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
pAddStaParams->assocId = pe_session->limAID;
pAddStaParams->staType = STA_ENTRY_SELF;
pAddStaParams->status = QDF_STATUS_SUCCESS;
pAddStaParams->respReqd = 1;
/* Update PE session ID */
pAddStaParams->sessionId = pe_session->peSessionId;
@ -2790,66 +2776,38 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
/* This will indicate HAL to "allocate" a new STA index */
pAddStaParams->staIdx = staIdx;
pAddStaParams->updateSta = updateSta;
qdf_mem_copy(&pAddStaParams->mbssid_info,
&pe_session->lim_join_req->bssDescription.mbssid_info,
sizeof(struct scan_mbssid_info));
lim_set_mbssid_info(pe_session);
pAddStaParams->shortPreambleSupported =
mac->mlme_cfg->ht_caps.short_preamble;
lim_populate_own_rate_set(mac, &pAddStaParams->supportedRates,
NULL, false,
pe_session, NULL, NULL);
if (IS_DOT11_MODE_HT(selfStaDot11Mode)) {
pAddStaParams->htCapable = true;
pAddStaParams->greenFieldCapable =
lim_get_ht_capability(mac, eHT_GREENFIELD,
pe_session);
pAddStaParams->ch_width =
mac->roam.configParam.channelBondingMode5GHz;
pAddStaParams->mimoPS =
lim_get_ht_capability(mac, eHT_MIMO_POWER_SAVE,
pe_session);
pAddStaParams->rifsMode =
lim_get_ht_capability(mac, eHT_RIFS_MODE,
pe_session);
pAddStaParams->lsigTxopProtection =
lim_get_ht_capability(mac, eHT_LSIG_TXOP_PROTECTION,
pe_session);
pAddStaParams->maxAmpduDensity =
lim_get_ht_capability(mac, eHT_MPDU_DENSITY,
pe_session);
pAddStaParams->maxAmpduSize =
lim_get_ht_capability(mac, eHT_MAX_RX_AMPDU_FACTOR,
pe_session);
pAddStaParams->maxAmsduSize =
lim_get_ht_capability(mac, eHT_MAX_AMSDU_LENGTH,
pe_session);
pAddStaParams->max_amsdu_num =
lim_get_ht_capability(mac, eHT_MAX_AMSDU_NUM,
pe_session);
pAddStaParams->fDsssCckMode40Mhz =
lim_get_ht_capability(mac, eHT_DSSS_CCK_MODE_40MHZ,
pe_session);
pAddStaParams->fShortGI20Mhz = pe_session->ht_config.ht_sgi20;
pAddStaParams->fShortGI40Mhz = pe_session->ht_config.ht_sgi40;
pe_debug("greenFieldCapable: %d maxAmpduDensity: %d maxAmpduSize: %d",
pAddStaParams->greenFieldCapable,
pe_debug("maxAmpduDensity: %d maxAmpduSize: %d",
pAddStaParams->maxAmpduDensity,
pAddStaParams->maxAmpduSize);
pe_debug("fDsssCckMode40Mhz: %d fShortGI20Mhz: %d fShortGI40Mhz: %d lsigTxopProtection: %d",
pAddStaParams->fDsssCckMode40Mhz,
pe_debug("fShortGI20Mhz: %d fShortGI40Mhz: %d",
pAddStaParams->fShortGI20Mhz,
pAddStaParams->fShortGI40Mhz,
pAddStaParams->lsigTxopProtection);
pAddStaParams->fShortGI40Mhz);
pe_debug("maxAmsduSize: %d txChannelWidth: %d mimoPS: %d rifsMode %d",
pAddStaParams->maxAmsduSize,
pAddStaParams->ch_width,
pAddStaParams->mimoPS, pAddStaParams->rifsMode);
pe_debug("txChannelWidth: %d mimoPS: %d",
pAddStaParams->ch_width, pAddStaParams->mimoPS);
}
pAddStaParams->vhtCapable = IS_DOT11_MODE_VHT(selfStaDot11Mode);
if (pAddStaParams->vhtCapable) {
@ -2905,11 +2863,9 @@ lim_add_sta_self(struct mac_context *mac, uint16_t staIdx, uint8_t updateSta,
pAddStaParams->nonRoamReassoc = 1;
pe_session->isNonRoamReassoc = 0;
}
pe_debug("sessionid: %d Assoc ID: %d listenInterval = %d "
"shortPreambleSupported: %d",
pe_session->smeSessionId, pAddStaParams->assocId,
pAddStaParams->listenInterval,
pAddStaParams->shortPreambleSupported);
pe_debug("sessionid: %d Assoc ID: %d listenInterval = %d",
pe_session->smeSessionId, pAddStaParams->assocId,
pAddStaParams->listenInterval);
if (IS_DOT11_MODE_HE(selfStaDot11Mode))
lim_add_self_he_cap(pAddStaParams, pe_session);
@ -3692,27 +3648,16 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pe_session->gUapsdPerAcBitmask;
pAddBssParams->staContext.maxSPLen = 0;
pAddBssParams->staContext.shortPreambleSupported =
(uint8_t) pAssocRsp->capabilityInfo.shortPreamble;
pAddBssParams->staContext.updateSta = updateEntry;
pe_debug("StaContext: " QDF_MAC_ADDR_STR
" shortPreambleSupported: %d",
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
pAddBssParams->staContext.shortPreambleSupported);
pe_debug("StaContext: staMac " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac));
if (IS_DOT11_MODE_HT(pe_session->dot11mode)
&& pBeaconStruct->HTCaps.present) {
pAddBssParams->staContext.us32MaxAmpduDuration = 0;
pAddBssParams->staContext.htCapable = 1;
pAddBssParams->staContext.greenFieldCapable =
(uint8_t) pAssocRsp->HTCaps.greenField;
pAddBssParams->staContext.lsigTxopProtection =
(uint8_t) pAssocRsp->HTCaps.lsigTXOPProtection;
pe_debug("StaCtx: htCap %d GFcap %d lsigTxopProtn %d",
pAddBssParams->staContext.htCapable,
pAddBssParams->staContext.greenFieldCapable,
pAddBssParams->staContext.lsigTxopProtection);
pe_debug("StaCtx: htCap %d",
pAddBssParams->staContext.htCapable);
if (pe_session->ht_config.ht_tx_stbc)
pAddBssParams->staContext.stbc_capable =
pAssocRsp->HTCaps.rxSTBC;
@ -3789,12 +3734,8 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams->staContext.mimoPS =
(tSirMacHTMIMOPowerSaveState)
pAssocRsp->HTCaps.mimoPowerSave;
pAddBssParams->staContext.maxAmsduSize =
(uint8_t) pAssocRsp->HTCaps.maximalAMSDUsize;
pAddBssParams->staContext.maxAmpduDensity =
pAssocRsp->HTCaps.mpduDensity;
pAddBssParams->staContext.fDsssCckMode40Mhz =
(uint8_t) pAssocRsp->HTCaps.dsssCckMode40MHz;
/*
* We will check gShortGI20Mhz and gShortGI40Mhz from
* session entry if they are set then we will use what ever
@ -3857,19 +3798,13 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
}
}
if (pBeaconStruct->HTInfo.present)
pAddBssParams->staContext.rifsMode =
pAssocRsp->HTInfo.rifsMode;
pe_debug("StaCtx: ChBW %d mimoPS %d",
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.mimoPS);
pe_debug("StaCtx: ChBW %d mimoPS %d maxAmsduSize %d",
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.mimoPS,
pAddBssParams->staContext.maxAmsduSize);
pe_debug("maxAmpduDens %d CckMode40Mhz %d SGI20Mhz %d",
pAddBssParams->staContext.maxAmpduDensity,
pAddBssParams->staContext.fDsssCckMode40Mhz,
pAddBssParams->staContext.fShortGI20Mhz);
pe_debug("maxAmpduDens %d SGI20Mhz %d",
pAddBssParams->staContext.maxAmpduDensity,
pAddBssParams->staContext.fShortGI20Mhz);
pe_debug("SGI40M %d maxAmpdu %d htLdpc %d vhtLdpc %d",
pAddBssParams->staContext.fShortGI40Mhz,
@ -4140,29 +4075,19 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pAddBssParams->staContext.assocId = 0;
pAddBssParams->staContext.uAPSD = 0;
pAddBssParams->staContext.maxSPLen = 0;
pAddBssParams->staContext.shortPreambleSupported =
(uint8_t) pBeaconStruct->capabilityInfo.shortPreamble;
pAddBssParams->staContext.updateSta = false;
pe_debug("StaCtx: " QDF_MAC_ADDR_STR " shortPreamble: %d",
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac),
pAddBssParams->staContext.shortPreambleSupported);
pe_debug("StaCtx: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac));
pAddBssParams->dot11_mode = pe_session->dot11mode;
pe_debug("dot11_mode:%d", pAddBssParams->dot11_mode);
if (IS_DOT11_MODE_HT(pe_session->dot11mode)
&& (pBeaconStruct->HTCaps.present)) {
pAddBssParams->staContext.us32MaxAmpduDuration = 0;
pAddBssParams->staContext.htCapable = 1;
pAddBssParams->staContext.greenFieldCapable =
(uint8_t) pBeaconStruct->HTCaps.greenField;
pAddBssParams->staContext.lsigTxopProtection =
(uint8_t) pBeaconStruct->HTCaps.lsigTXOPProtection;
pe_debug("StaCtx: htCap %d GFCap %d lsigTxopProtn %d",
pAddBssParams->staContext.htCapable,
pAddBssParams->staContext.greenFieldCapable,
pAddBssParams->staContext.lsigTxopProtection);
pe_debug("StaCtx: htCap %d",
pAddBssParams->staContext.htCapable);
if (pe_session->vhtCapability &&
(IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) ||
IS_BSS_VHT_CAPABLE(
@ -4218,12 +4143,8 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pAddBssParams->staContext.mimoPS =
(tSirMacHTMIMOPowerSaveState) pBeaconStruct->HTCaps.
mimoPowerSave;
pAddBssParams->staContext.maxAmsduSize =
(uint8_t) pBeaconStruct->HTCaps.maximalAMSDUsize;
pAddBssParams->staContext.maxAmpduDensity =
pBeaconStruct->HTCaps.mpduDensity;
pAddBssParams->staContext.fDsssCckMode40Mhz =
(uint8_t) pBeaconStruct->HTCaps.dsssCckMode40MHz;
/*
* We will check gShortGI20Mhz and gShortGI40Mhz from ini file.
* if they are set then we will use what ever Beacon coming
@ -4271,18 +4192,13 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pAddBssParams->staContext.vhtLdpcCapable = 0;
}
if (pBeaconStruct->HTInfo.present)
pAddBssParams->staContext.rifsMode =
pBeaconStruct->HTInfo.rifsMode;
pe_debug("StaContext ChannelWidth: %d mimoPS: %d maxAmsduSize: %d",
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.mimoPS,
pAddBssParams->staContext.maxAmsduSize);
pe_debug("StaContext ChannelWidth: %d mimoPS: %d",
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.mimoPS);
pe_debug("maxAmpduDensity %d Cck40Mhz %d SGI20Mhz %d",
pAddBssParams->staContext.maxAmpduDensity,
pAddBssParams->staContext.fDsssCckMode40Mhz,
pAddBssParams->staContext.fShortGI20Mhz);
pe_debug("maxAmpduDensity %d SGI20Mhz %d",
pAddBssParams->staContext.maxAmpduDensity,
pAddBssParams->staContext.fShortGI20Mhz);
pe_debug("SGI40M %d maxAmpdu %d htLdpc %d vhtLdpc %d",
pAddBssParams->staContext.fShortGI40Mhz,

15
core/mac/src/pe/lim/lim_ft.c
View file

@ -268,8 +268,6 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
pAddBssParams->staContext.assocId = 0;
pAddBssParams->staContext.uAPSD = 0;
pAddBssParams->staContext.maxSPLen = 0;
pAddBssParams->staContext.shortPreambleSupported =
(uint8_t) pBeaconStruct->capabilityInfo.shortPreamble;
pAddBssParams->staContext.updateSta = false;
pAddBssParams->staContext.encryptType =
ft_session->encryptType;
@ -280,12 +278,7 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
if (IS_DOT11_MODE_HT(ft_session->dot11mode) &&
(pBeaconStruct->HTCaps.present)) {
pAddBssParams->staContext.us32MaxAmpduDuration = 0;
pAddBssParams->staContext.htCapable = 1;
pAddBssParams->staContext.greenFieldCapable =
(uint8_t) pBeaconStruct->HTCaps.greenField;
pAddBssParams->staContext.lsigTxopProtection =
(uint8_t) pBeaconStruct->HTCaps.lsigTXOPProtection;
if (pBeaconStruct->HTCaps.supportedChannelWidthSet &&
chan_width_support) {
pAddBssParams->staContext.ch_width = (uint8_t)
@ -327,22 +320,14 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
pAddBssParams->staContext.mimoPS =
(tSirMacHTMIMOPowerSaveState) pBeaconStruct->HTCaps.
mimoPowerSave;
pAddBssParams->staContext.maxAmsduSize =
(uint8_t) pBeaconStruct->HTCaps.maximalAMSDUsize;
pAddBssParams->staContext.maxAmpduDensity =
pBeaconStruct->HTCaps.mpduDensity;
pAddBssParams->staContext.fDsssCckMode40Mhz =
(uint8_t) pBeaconStruct->HTCaps.dsssCckMode40MHz;
pAddBssParams->staContext.fShortGI20Mhz =
(uint8_t) pBeaconStruct->HTCaps.shortGI20MHz;
pAddBssParams->staContext.fShortGI40Mhz =
(uint8_t) pBeaconStruct->HTCaps.shortGI40MHz;
pAddBssParams->staContext.maxAmpduSize =
pBeaconStruct->HTCaps.maxRxAMPDUFactor;
if (pBeaconStruct->HTInfo.present)
pAddBssParams->staContext.rifsMode =
pBeaconStruct->HTInfo.rifsMode;
}
if ((ft_session->limWmeEnabled

2
core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
View file

@ -1186,7 +1186,7 @@ lim_ibss_add_sta_rsp(struct mac_context *mac, void *msg, struct pe_session *pe_s
return QDF_STATUS_E_FAILURE;
}
sta->bssId = pAddStaParams->bss_idx;
sta->bssId = pe_session->vdev_id;
sta->staIndex = pAddStaParams->staIdx;
sta->valid = 1;
sta->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;

22
core/mac/src/pe/lim/lim_process_mlm_host_roam.c
View file

@ -475,7 +475,6 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
pAddStaParams->staType = STA_ENTRY_SELF;
pAddStaParams->status = QDF_STATUS_SUCCESS;
pAddStaParams->respReqd = 1;
/* Update PE session ID */
pAddStaParams->sessionId = pe_session->peSessionId;
@ -488,8 +487,6 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
pAddStaParams->staIdx = STA_INVALID_IDX;
pAddStaParams->updateSta = false;
pAddStaParams->shortPreambleSupported =
(uint8_t) pe_session->beaconParams.fShortPreamble;
lim_populate_peer_rate_set(mac, &pAddStaParams->supportedRates, NULL,
false, pe_session, NULL, NULL);
@ -497,33 +494,16 @@ void lim_process_sta_mlm_add_bss_rsp_ft(struct mac_context *mac,
pAddStaParams->htCapable = pe_session->htCapability;
pAddStaParams->vhtCapable = pe_session->vhtCapability;
pAddStaParams->ch_width = pe_session->ch_width;
pAddStaParams->greenFieldCapable =
lim_get_ht_capability(mac, eHT_GREENFIELD,
pe_session);
pAddStaParams->mimoPS =
lim_get_ht_capability(mac, eHT_MIMO_POWER_SAVE,
pe_session);
pAddStaParams->rifsMode =
lim_get_ht_capability(mac, eHT_RIFS_MODE,
pe_session);
pAddStaParams->lsigTxopProtection =
lim_get_ht_capability(mac, eHT_LSIG_TXOP_PROTECTION,
pe_session);
pAddStaParams->maxAmpduDensity =
lim_get_ht_capability(mac, eHT_MPDU_DENSITY,
pe_session);
pAddStaParams->maxAmpduSize =
lim_get_ht_capability(mac, eHT_MAX_RX_AMPDU_FACTOR,
pe_session);
pAddStaParams->maxAmsduSize =
lim_get_ht_capability(mac, eHT_MAX_AMSDU_LENGTH,
pe_session);
pAddStaParams->max_amsdu_num =
lim_get_ht_capability(mac, eHT_MAX_AMSDU_NUM,
pe_session);
pAddStaParams->fDsssCckMode40Mhz =
lim_get_ht_capability(mac, eHT_DSSS_CCK_MODE_40MHZ,
pe_session);
pAddStaParams->fShortGI20Mhz =
lim_get_ht_capability(mac, eHT_SHORT_GI_20MHZ,
pe_session);

30
core/mac/src/pe/lim/lim_process_mlm_req_messages.c
View file

@ -192,14 +192,10 @@ static void mlm_add_sta(struct mac_context *mac_ctx, tpAddStaParams sta_param,
val = mac_ctx->mlme_cfg->sap_cfg.listen_interval;
sta_param->listenInterval = (uint16_t) val;
sta_param->shortPreambleSupported =
mac_ctx->mlme_cfg->ht_caps.short_preamble;
sta_param->assocId = 0; /* Is SMAC OK with this? */
sta_param->wmmEnabled = 0;
sta_param->uAPSD = 0;
sta_param->maxSPLen = 0;
sta_param->us32MaxAmpduDuration = 0;
sta_param->maxAmpduSize = 0; /* 0: 8k, 1: 16k,2: 32k,3: 64k, 4:128k */
/* For Self STA get the LDPC capability from config.ini */
@ -210,33 +206,15 @@ static void mlm_add_sta(struct mac_context *mac_ctx, tpAddStaParams sta_param,
if (IS_DOT11_MODE_HT(session_entry->dot11mode)) {
sta_param->htCapable = ht_capable;
sta_param->greenFieldCapable =
lim_get_ht_capability(mac_ctx, eHT_GREENFIELD,
session_entry);
sta_param->ch_width =
lim_get_ht_capability(mac_ctx,
eHT_SUPPORTED_CHANNEL_WIDTH_SET, session_entry);
sta_param->mimoPS =
(tSirMacHTMIMOPowerSaveState)lim_get_ht_capability(
mac_ctx, eHT_MIMO_POWER_SAVE, session_entry);
sta_param->rifsMode =
lim_get_ht_capability(mac_ctx, eHT_RIFS_MODE,
session_entry);
sta_param->lsigTxopProtection =
lim_get_ht_capability(mac_ctx, eHT_LSIG_TXOP_PROTECTION,
session_entry);
sta_param->maxAmpduDensity =
lim_get_ht_capability(mac_ctx, eHT_MPDU_DENSITY,
session_entry);
sta_param->maxAmsduSize =
lim_get_ht_capability(mac_ctx, eHT_MAX_AMSDU_LENGTH,
session_entry);
sta_param->max_amsdu_num =
lim_get_ht_capability(mac_ctx, eHT_MAX_AMSDU_NUM,
session_entry);
sta_param->fDsssCckMode40Mhz =
lim_get_ht_capability(mac_ctx, eHT_DSSS_CCK_MODE_40MHZ,
session_entry);
sta_param->fShortGI20Mhz =
lim_get_ht_capability(mac_ctx, eHT_SHORT_GI_20MHZ,
session_entry);
@ -274,11 +252,9 @@ static void mlm_add_sta(struct mac_context *mac_ctx, tpAddStaParams sta_param,
lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL,
false, session_entry, NULL, NULL);
pe_debug("GF: %d, ChnlWidth: %d, MimoPS: %d, lsigTXOP: %d, dsssCCK: %d,"
" SGI20: %d, SGI40%d", sta_param->greenFieldCapable,
sta_param->ch_width, sta_param->mimoPS,
sta_param->lsigTxopProtection, sta_param->fDsssCckMode40Mhz,
sta_param->fShortGI20Mhz, sta_param->fShortGI40Mhz);
pe_debug("ChnlWidth: %d, MimoPS: %d, SGI20: %d, SGI40%d",
sta_param->ch_width, sta_param->mimoPS,
sta_param->fShortGI20Mhz, sta_param->fShortGI40Mhz);
if (QDF_P2P_GO_MODE == session_entry->opmode)
sta_param->p2pCapableSta = 1;

2
core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
View file

@ -1919,7 +1919,7 @@ void lim_process_ap_mlm_add_sta_rsp(struct mac_context *mac,
pe_session);
goto end;
}
sta->bssId = pAddStaParams->bss_idx;
sta->bssId = pe_session->vdev_id;
sta->staIndex = pAddStaParams->staIdx;
sta->nss = pAddStaParams->nss;
/* if the AssocRsp frame is not acknowledged, then keep alive timer will take care of the state */

2
core/mac/src/pe/lim/lim_process_tdls.c
View file

@ -2738,7 +2738,7 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(struct mac_context *mac, void *msg,
goto add_sta_error;
}
sta->bssId = pAddStaParams->bss_idx;
sta->bssId = pe_session->vdev_id;
sta->staIndex = pAddStaParams->staIdx;
sta->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;
sta->valid = 1;

2
core/mac/src/pe/nan/nan_datapath.c
View file

@ -493,7 +493,7 @@ void lim_ndp_add_sta_rsp(struct mac_context *mac_ctx, struct pe_session *session
qdf_mem_free(add_sta_rsp);
return;
}
sta_ds->bssId = add_sta_rsp->bss_idx;
sta_ds->bssId = session->vdev_id;
sta_ds->staIndex = add_sta_rsp->staIdx;
sta_ds->valid = 1;
sta_ds->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE;

40
core/wma/inc/wma_if.h
View file

@ -125,30 +125,21 @@ struct sAniProbeRspStruct {
* @assocId: associd
* @staType: 0 - Self, 1 other/remote, 2 - bssid
* @staMac: MAC Address of STA
* @shortPreambleSupported: is short preamble supported or not
* @listenInterval: Listen interval
* @wmmEnabled: Support for 11e/WMM
* @uAPSD: U-APSD Flags: 1b per AC
* @maxSPLen: Max SP Length
* @htCapable: 11n HT capable STA
* @greenFieldCapable: 11n Green Field preamble support
* @txChannelWidthSet: TX Width Set: 0 - 20 MHz only, 1 - 20/40 MHz
* @mimoPS: MIMO Power Save
* @rifsMode: RIFS mode: 0 - NA, 1 - Allowed
* @lsigTxopProtection: L-SIG TXOP Protection mechanism
* @us32MaxAmpduDuration: in units of 32 us
* @maxAmpduSize: 0 : 8k , 1 : 16k, 2 : 32k, 3 : 64k
* @maxAmpduDensity: 3 : 0~7 : 2^(11nAMPDUdensity -4)
* @maxAmsduSize: 1 : 3839 bytes, 0 : 7935 bytes
* @fDsssCckMode40Mhz: DSSS CCK supported 40MHz
* @fShortGI40Mhz: short GI support for 40Mhz packets
* @fShortGI20Mhz: short GI support for 20Mhz packets
* @supportedRates: legacy supported rates
* @status: QDF status
* @staIdx: station index
* @bss_idx: BSSID of BSS to which the station is associated
* @updateSta: pdate the existing STA entry, if this flag is set
* @respReqd: A flag to indicate to HAL if the response message is required
* @rmfEnabled: Robust Management Frame (RMF) enabled/disabled
* @encryptType: The unicast encryption type in the association
* @sessionId: PE session id
@ -160,7 +151,6 @@ struct sAniProbeRspStruct {
* @vhtTxBFCapable: txbf capable or not
* @vhtTxMUBformeeCapable: Bformee capable or not
* @enableVhtpAid: enable VHT AID
* @enableVhtGid: enable VHT GID
* @enableAmpduPs: AMPDU power save
* @enableHtSmps: enable HT SMPS
* @htSmpsconfig: HT SMPS config
@ -178,8 +168,6 @@ struct sAniProbeRspStruct {
* @peerAtimWindowLength: peer ATIM Window length
* @nss: Return the number of spatial streams supported
* @stbc_capable: stbc capable
* @max_amsdu_num: Maximum number of MSDUs in a tx aggregate frame
* @mbssid_info: Multiple bssid information
* @no_ptk_4_way: Do not need 4-way handshake
*
* This structure contains parameter required for
@ -193,39 +181,22 @@ typedef struct {
* This may or may not be required in production driver.
*/
uint8_t staType;
uint8_t shortPreambleSupported;
tSirMacAddr staMac;
uint16_t listenInterval;
uint8_t wmmEnabled;
uint8_t uAPSD;
uint8_t maxSPLen;
uint8_t htCapable;
/* 11n Green Field preamble support
* 0 - Not supported, 1 - Supported
* Add it to RA related fields of sta entry in HAL
*/
uint8_t greenFieldCapable;
uint8_t ch_width;
tSirMacHTMIMOPowerSaveState mimoPS;
uint8_t rifsMode;
/* L-SIG TXOP Protection mechanism
* 0 - No Support, 1 - Supported
* SG - there is global field.
*/
uint8_t lsigTxopProtection;
uint8_t us32MaxAmpduDuration;
uint8_t maxAmpduSize;
uint8_t maxAmpduDensity;
uint8_t maxAmsduSize;
/* 11n Parameters */
/* HT STA should set it to 1 if it is enabled in BSS
* HT STA should set it to 0 if AP does not support it.
* This indication is sent to HAL and HAL uses this flag
* to pickup up appropriate 40Mhz rates.
*/
uint8_t fDsssCckMode40Mhz;
uint8_t fShortGI40Mhz;
uint8_t fShortGI20Mhz;
struct supported_rates supportedRates;
@ -239,15 +210,7 @@ typedef struct {
* QDF_STATUS_SUCCESS
*/
uint8_t staIdx;
/* BSSID of BSS to which the station is associated.
* This should be filled back in by HAL, and sent back to LIM as part of
* the response message, so LIM can cache it in the station entry of
* hash table. When station is deleted, LIM will make use of this
* bss_idx to delete BSS from hal tables and from softmac.
*/
uint8_t bss_idx;
uint8_t updateSta;
uint8_t respReqd;
uint8_t rmfEnabled;
uint32_t encryptType;
uint8_t sessionId;
@ -259,7 +222,6 @@ typedef struct {
uint8_t enable_su_tx_bformer;
uint8_t vhtTxMUBformeeCapable;
uint8_t enableVhtpAid;
uint8_t enableVhtGid;
uint8_t enableAmpduPs;
uint8_t enableHtSmps;
uint8_t htSmpsconfig;
@ -278,14 +240,12 @@ typedef struct {
uint32_t peerAtimWindowLength;
uint8_t nonRoamReassoc;
uint32_t nss;
struct scan_mbssid_info mbssid_info;
#ifdef WLAN_FEATURE_11AX
bool he_capable;
tDot11fIEhe_cap he_config;
tDot11fIEhe_op he_op;
#endif
uint8_t stbc_capable;
uint8_t max_amsdu_num;
#ifdef WLAN_SUPPORT_TWT
uint8_t twt_requestor;
uint8_t twt_responder;