qcacld-3.0: Remove duplicate logs from sta_send_add_bss

lim_sta_send_add_bss_pre_assoc, sta_send_add_bss and
wma_send_peer_assoc have duplicate logs.

Also send_peer_assoc_cmd_tlv print all the required info with
flags and other params.

So remove the duplicate logs and keep only missing info in
sta_send_add_bss and wma_send_peer_assoc, which is not printed
anywhere.

Change-Id: Ic5aa63f1a4296553b584bcc768d8c5cb04ddddf3
CRs-Fixed: 2616910
This commit is contained in:
Abhishek Singh 2020-02-06 13:35:28 +05:30 committed by nshrivas
parent df747419bc
commit 9e0b8cdc2e
4 changed files with 20 additions and 144 deletions

View File

@ -3341,8 +3341,6 @@ static void lim_update_vhtcaps_assoc_resp(struct mac_context *mac_ctx,
pAddBssParams->staContext.maxAmpduSize =
SIR_MAC_GET_VHT_MAX_AMPDU_EXPO(
pAddBssParams->staContext.vht_caps);
pe_debug("Updating VHT caps in assoc Response");
}
/**
@ -3375,8 +3373,6 @@ static void lim_update_vht_oper_assoc_resp(struct mac_context *mac_ctx,
ch_width = pe_session->ch_width;
pAddBssParams->ch_width = ch_width;
pAddBssParams->staContext.ch_width = ch_width;
pe_debug("ch_width %d, pe chanWidth %d ccfs0 %d, ccfs1 %d",
pAddBssParams->ch_width, pe_session->ch_width, ccfs0, ccfs1);
}
#ifdef WLAN_SUPPORT_TWT
@ -3409,7 +3405,6 @@ void lim_sta_add_bss_update_ht_parameter(uint32_t bss_chan_freq,
return;
add_bss->htCapable = ht_cap->present;
pe_debug("htCapable: %d", add_bss->htCapable);
if (!ht_inf->present)
return;
@ -3418,8 +3413,6 @@ void lim_sta_add_bss_update_ht_parameter(uint32_t bss_chan_freq,
add_bss->ch_width = ht_inf->recommendedTxWidthSet;
else
add_bss->ch_width = CH_WIDTH_20MHZ;
pe_debug("ch_width %d", add_bss->ch_width);
}
QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp,
@ -3450,12 +3443,6 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId,
sizeof(tSirMacAddr));
pe_debug("sessionid: %d updateEntry: %d limsystemrole: %d",
pe_session->smeSessionId, updateEntry,
GET_LIM_SYSTEM_ROLE(pe_session));
pe_debug("BSSID: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
pAddBssParams->beaconInterval = bssDescription->beaconInterval;
pAddBssParams->dtimPeriod = pBeaconStruct->tim.dtimPeriod;
@ -3473,12 +3460,6 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams->llbCoexist =
(uint8_t) pe_session->beaconParams.llbCoexist;
pe_debug("Beacon Interval: %d dtimPeriod: %d",
pAddBssParams->beaconInterval, pAddBssParams->dtimPeriod);
pe_debug("nwType:%d shortSlotTimeSupported: %d llbCoexist: %d",
pAddBssParams->nwType, pAddBssParams->shortSlotTimeSupported,
pAddBssParams->llbCoexist);
/* Use the advertised capabilities from the received beacon/PR */
if (IS_DOT11_MODE_HT(pe_session->dot11mode)) {
chan_width_support =
@ -3492,7 +3473,6 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams);
}
pe_debug("current op frequency %d", bssDescription->chan_freq);
if (pe_session->vhtCapability && (pAssocRsp->VHTCaps.present)) {
pAddBssParams->vhtCapable = pAssocRsp->VHTCaps.present;
vht_caps = &pAssocRsp->VHTCaps;
@ -3554,14 +3534,9 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams->staContext.maxSPLen = 0;
pAddBssParams->staContext.updateSta = updateEntry;
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.htCapable = 1;
pe_debug("StaCtx: htCap %d",
pAddBssParams->staContext.htCapable);
if (pe_session->ht_config.ht_tx_stbc)
pAddBssParams->staContext.stbc_capable =
pAssocRsp->HTCaps.rxSTBC;
@ -3643,14 +3618,6 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
sta_context->vhtTxBFCapable = 0;
}
pe_debug("StaCtx: vhtCap %d ChBW %d TxBF %d ch_width %d",
pAddBssParams->staContext.vhtCapable,
pAddBssParams->staContext.ch_width,
sta_context->vhtTxBFCapable, pAddBssParams->ch_width);
pe_debug("StaContext su_tx_bfer %d, vht_mcs11 %d",
sta_context->enable_su_tx_bformer,
pAddBssParams->staContext.vht_mcs_10_11_supp);
pAddBssParams->staContext.mimoPS =
(tSirMacHTMIMOPowerSaveState)
pAssocRsp->HTCaps.mimoPowerSave;
@ -3718,19 +3685,6 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
}
}
pe_debug("StaCtx: ChBW %d mimoPS %d",
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.mimoPS);
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,
pAddBssParams->staContext.maxAmpduSize,
pAddBssParams->staContext.htLdpcCapable,
pAddBssParams->staContext.vhtLdpcCapable);
}
if (lim_is_he_6ghz_band(pe_session)) {
if (lim_is_session_he_capable(pe_session) &&
@ -3787,15 +3741,11 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams->staContext.encryptType = pe_session->encryptType;
pAddBssParams->maxTxPower = pe_session->maxTxPower;
pe_debug("maxTxPower: %d", pAddBssParams->maxTxPower);
if (QDF_P2P_CLIENT_MODE == pe_session->opmode)
pAddBssParams->staContext.p2pCapableSta = 1;
pAddBssParams->bSpectrumMgtEnabled = pe_session->spectrumMgtEnabled;
pAddBssParams->extSetStaKeyParamValid = 0;
pe_debug("extSetStaKeyParamValid: %d",
pAddBssParams->extSetStaKeyParamValid);
#ifdef WLAN_FEATURE_11W
if (pe_session->limRmfEnabled) {
@ -3822,20 +3772,18 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
pAddBssParams->staContext.vht_caps &=
~(1 << SIR_MAC_VHT_CAP_LDPC_CODING_CAP);
pe_debug("staContext wmmEnabled: %d encryptType: %d "
"p2pCapableSta: %d",
pAddBssParams->staContext.wmmEnabled,
pAddBssParams->staContext.encryptType,
pAddBssParams->staContext.p2pCapableSta);
pe_debug("bSpectrumMgtEnabled: %d LimMlm state to %d",
pAddBssParams->bSpectrumMgtEnabled, pe_session->limMlmState);
if (pe_session->isNonRoamReassoc)
pAddBssParams->nonRoamReassoc = 1;
/* we need to defer the message until we get the response back from HAL. */
SET_LIM_PROCESS_DEFD_MESGS(mac, false);
pe_debug("update %d MxAmpduDen %d mimoPS %d vht_mcs11 %d shortSlot %d BI %d DTIM %d enc type %d p2p cab STA %d",
updateEntry,
pAddBssParams->staContext.maxAmpduDensity,
pAddBssParams->staContext.mimoPS,
pAddBssParams->staContext.vht_mcs_10_11_supp,
pAddBssParams->shortSlotTimeSupported,
pAddBssParams->beaconInterval, pAddBssParams->dtimPeriod,
pAddBssParams->staContext.encryptType,
pAddBssParams->staContext.p2pCapableSta);
if (cds_is_5_mhz_enabled()) {
pAddBssParams->ch_width = CH_WIDTH_5MHZ;
pAddBssParams->staContext.ch_width = CH_WIDTH_5MHZ;
@ -3847,8 +3795,9 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
if (lim_is_fils_connection(pe_session))
pAddBssParams->no_ptk_4_way = true;
pe_debug("vhtCapable %d ch_width %d", pAddBssParams->vhtCapable,
pAddBssParams->staContext.ch_width);
/* we need to defer the message until we get the response back */
SET_LIM_PROCESS_DEFD_MESGS(mac, false);
retCode = wma_send_peer_assoc_req(pAddBssParams);
if (QDF_IS_STATUS_ERROR(retCode)) {
@ -3901,13 +3850,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId,
sizeof(tSirMacAddr));
pe_debug("sessionid: %d limsystemrole = %d",
pe_session->smeSessionId,
GET_LIM_SYSTEM_ROLE(pe_session));
pe_debug("BSSID: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->bssId));
pAddBssParams->beaconInterval = bssDescription->beaconInterval;
pAddBssParams->dtimPeriod = pBeaconStruct->tim.dtimPeriod;
@ -3920,13 +3862,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pAddBssParams->llbCoexist =
(uint8_t) pe_session->beaconParams.llbCoexist;
pe_debug("Beacon Interval: %d dtimPeriod: %d",
pAddBssParams->beaconInterval, pAddBssParams->dtimPeriod);
pe_debug("nwType:%d shortSlotTimeSupported: %d llbCoexist: %d",
pAddBssParams->nwType, pAddBssParams->shortSlotTimeSupported,
pAddBssParams->llbCoexist);
/* Use the advertised capabilities from the received beacon/PR */
if (IS_DOT11_MODE_HT(pe_session->dot11mode)) {
chan_width_support =
@ -3972,8 +3907,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
lim_update_bss_he_capable(mac, pAddBssParams);
lim_add_bss_he_cfg(pAddBssParams, pe_session);
}
pe_debug("vhtCapable %d ch_width %d", pAddBssParams->vhtCapable,
pAddBssParams->ch_width);
/*
* Populate the STA-related parameters here
* Note that the STA here refers to the AP
@ -3991,14 +3925,9 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pAddBssParams->staContext.maxSPLen = 0;
pAddBssParams->staContext.updateSta = false;
pe_debug("StaCtx: " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac));
if (IS_DOT11_MODE_HT(pe_session->dot11mode)
&& (pBeaconStruct->HTCaps.present)) {
pAddBssParams->staContext.htCapable = 1;
pe_debug("StaCtx: htCap %d",
pAddBssParams->staContext.htCapable);
if (pe_session->vhtCapability &&
(IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) ||
IS_BSS_VHT_CAPABLE(
@ -4024,9 +3953,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pe_session->vht_config.su_beam_former)
pAddBssParams->staContext.enable_su_tx_bformer
= 1;
pe_debug("StaContext: su_tx_bfer %d",
pAddBssParams->staContext.enable_su_tx_bformer);
}
if (lim_is_session_he_capable(pe_session) &&
pBeaconStruct->he_cap.present)
@ -4043,10 +3969,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
vht_oper->chanWidth)
pAddBssParams->staContext.ch_width =
vht_oper->chanWidth + 1;
pe_debug("StaCtx: vhtCap %d ch_bw %d TxBF %d",
pAddBssParams->staContext.vhtCapable,
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.vhtTxBFCapable);
} else {
pAddBssParams->staContext.ch_width =
CH_WIDTH_20MHZ;
@ -4093,7 +4015,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
else if (pBeaconStruct->vendor_vht_ie.VHTCaps.present) {
vht_caps =
&pBeaconStruct->vendor_vht_ie.VHTCaps;
pe_debug("VHT Caps are in vendor Specific IE");
}
if (vht_caps &&
(pe_session->txLdpcIniFeatureEnabled & 0x2))
@ -4102,20 +4023,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
else
pAddBssParams->staContext.vhtLdpcCapable = 0;
}
pe_debug("StaContext ChannelWidth: %d mimoPS: %d",
pAddBssParams->staContext.ch_width,
pAddBssParams->staContext.mimoPS);
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,
pAddBssParams->staContext.maxAmpduSize,
pAddBssParams->staContext.htLdpcCapable,
pAddBssParams->staContext.vhtLdpcCapable);
}
/*
* If WMM IE or 802.11E IE is not present
@ -4142,15 +4049,10 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
pAddBssParams->staContext.encryptType = pe_session->encryptType;
pAddBssParams->maxTxPower = pe_session->maxTxPower;
pe_debug("maxTxPower: %d", pAddBssParams->maxTxPower);
pAddBssParams->staContext.smesessionId = pe_session->smeSessionId;
pAddBssParams->staContext.sessionId = pe_session->peSessionId;
pAddBssParams->bSpectrumMgtEnabled = pe_session->spectrumMgtEnabled;
pAddBssParams->extSetStaKeyParamValid = 0;
pe_debug("extSetStaKeyParamValid: %d",
pAddBssParams->extSetStaKeyParamValid);
#ifdef WLAN_FEATURE_11W
if (pe_session->limRmfEnabled) {
@ -4164,16 +4066,6 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
MTRACE(mac_trace
(mac, TRACE_CODE_MLM_STATE, pe_session->peSessionId,
pe_session->limMlmState));
pe_debug("staContext wmmEnabled: %d encryptType: %d "
"p2pCapableSta: %d",
pAddBssParams->staContext.wmmEnabled,
pAddBssParams->staContext.encryptType,
pAddBssParams->staContext.p2pCapableSta);
pe_debug("bSpectrumMgtEnabled: %d LimMlm state %d",
pAddBssParams->bSpectrumMgtEnabled, pe_session->limMlmState);
if (cds_is_5_mhz_enabled()) {
pAddBssParams->ch_width = CH_WIDTH_5MHZ;
pAddBssParams->staContext.ch_width = CH_WIDTH_5MHZ;

View File

@ -363,7 +363,6 @@ struct bss_params {
uint8_t extSetStaKeyParamValid;
tSetStaKeyParams extSetStaKeyParam;
uint8_t bSpectrumMgtEnabled;
uint8_t vhtCapable;
enum phy_ch_width ch_width;
uint8_t nonRoamReassoc;

View File

@ -3293,8 +3293,7 @@ wma_vdev_set_bss_params(tp_wma_handle wma, int vdev_id,
if (!maxTxPower)
WMA_LOGW("Setting Tx power limit to 0");
WMA_LOGD("Set maxTx pwr [WMI_VDEV_PARAM_TX_PWRLIMIT] to %d",
maxTxPower);
wma_debug("Set maxTx pwr to %d", maxTxPower);
ret = wma_vdev_set_param(wma->wmi_handle, vdev_id,
WMI_VDEV_PARAM_TX_PWRLIMIT,
maxTxPower);
@ -3762,8 +3761,7 @@ QDF_STATUS wma_send_peer_assoc_req(struct bss_params *add_bss)
if (QDF_IS_STATUS_ERROR(status))
WMA_LOGE("Failed to send wmi packet power save cmd");
else
WMA_LOGD("Sent PKT_PWR_SAVE_5G_EBT cmd to target, val = %x, status = %d",
pps_val, status);
WMA_LOGD("Sent packet power save %x", pps_val);
add_bss->staContext.no_ptk_4_way = add_bss->no_ptk_4_way;
@ -4262,7 +4260,6 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
if (wmi_service_enabled(wma->wmi_handle,
wmi_service_peer_assoc_conf)) {
WMA_LOGD(FL("WMI_SERVICE_PEER_ASSOC_CONF is enabled"));
peer_assoc_cnf = true;
msg = wma_fill_hold_req(wma, params->smesessionId,
WMA_ADD_STA_REQ, WMA_PEER_ASSOC_CNF_START,

View File

@ -1508,10 +1508,8 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
|| params->encryptType == eSIR_ED_WPI
#endif /* FEATURE_WLAN_WAPI */
) {
if (!params->no_ptk_4_way) {
if (!params->no_ptk_4_way)
cmd->need_ptk_4_way = 1;
wma_nofl_debug("no ptk 4 way %d", params->no_ptk_4_way);
}
wma_nofl_debug("Acquire set key wake lock for %d ms",
WMA_VDEV_SET_KEY_WAKELOCK_TIMEOUT);
wma_acquire_wakelock(&intr->vdev_set_key_wakelock,
@ -1577,8 +1575,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
wma_nofl_debug("Num tx_streams: %d, Disabled txSTBC",
intr->tx_streams);
}
wma_nofl_debug("peer_nss %d peer_ht_rates.num_rates %d ", cmd->peer_nss,
peer_ht_rates.num_rates);
cmd->vht_capable = params->vhtCapable;
if (params->vhtCapable) {
@ -1617,9 +1613,10 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
}
}
wma_debug("rx_max_rate: %d, rx_mcs: %x, tx_max_rate: %d, tx_mcs: %x",
wma_debug("rx_max_rate %d, rx_mcs %x, tx_max_rate %d, tx_mcs: %x num rates %d need 4 way %d",
cmd->rx_max_rate, cmd->rx_mcs_set, cmd->tx_max_rate,
cmd->tx_mcs_set);
cmd->tx_mcs_set, peer_ht_rates.num_rates,
cmd->need_ptk_4_way);
/*
* Limit nss to max number of rf chain supported by target
@ -1637,15 +1634,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma,
/* Till conversion is not done in WMI we need to fill fw phy mode */
cmd->peer_phymode = wma_host_to_fw_phymode(phymode);
wma_debug("vdev_id %d associd %d rate_caps %x peer_caps %x",
cmd->vdev_id, cmd->peer_associd,
cmd->peer_rate_caps, cmd->peer_caps);
wma_debug("listen_intval %d ht_caps %x max_mpdu %d nss %d fw_phymode %d",
cmd->peer_listen_intval, cmd->peer_ht_caps,
cmd->peer_max_mpdu, cmd->peer_nss, cmd->peer_phymode);
wma_debug("peer_mpdu_density %d encr_type %d cmd->peer_vht_caps %x",
cmd->peer_mpdu_density, params->encryptType,
cmd->peer_vht_caps);
status = wmi_unified_peer_assoc_send(wma->wmi_handle,
cmd);