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: Remove redundant SAP logs

Browse source 
Remove excessive SAP start/client connection logs.

Change-Id: Idb593c3eee77eb24084eca15ce53a43a3f4060da
CRs-Fixed: 2627367
This commit is contained in:
Pragaspathi Thilagaraj 2020-02-23 15:58:01 +05:30 • committed by nshrivas
commit ae0fb161a4
7 changed files with 67 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20757,8 +20757,6 @@ QDF_STATUS hdd_softap_deauth_all_sta(struct hdd_adapter *adapter,
ucfg_mlme_get_sap_bcast_deauth_enabled(hdd_ctx->psoc,
&is_sap_bcast_deauth_enabled);
hdd_debug("sap_bcast_deauth_enabled %d", is_sap_bcast_deauth_enabled);
if (is_sap_bcast_deauth_enabled)
return QDF_STATUS_E_INVAL;

126
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -2767,7 +2767,7 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
tDot11fIEWPA dot11_wpa_ie = {0};
if (!mac_handle) {
hdd_err("Error haHandle returned NULL");
hdd_err("NULL mac Handle");
return -EINVAL;
}
/* Validity checks */
@ -2790,14 +2790,13 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
ret = sme_unpack_rsn_ie(mac_handle, rsn_ie, rsn_ie_len,
&dot11_rsn_ie, false);
if (DOT11F_FAILED(ret)) {
hdd_err("unpack failed, ret: 0x%x", ret);
hdd_err("unpack failed, 0x%x", ret);
return -EINVAL;
}
/* Copy out the encryption and authentication types */
hdd_debug("pairwise cipher suite count: %d",
dot11_rsn_ie.pwise_cipher_suite_count);
hdd_debug("authentication suite count: %d",
dot11_rsn_ie.akm_suite_cnt);
hdd_debug("pairwise cipher count: %d akm count:%d",
dot11_rsn_ie.pwise_cipher_suite_count,
dot11_rsn_ie.akm_suite_cnt);
/*
* Translate akms in akm suite
*/
@ -2832,15 +2831,13 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
rsn_ie, rsn_ie_len,
&dot11_wpa_ie, false);
if (DOT11F_FAILED(ret)) {
hdd_err("unpack failed, ret: 0x%x", ret);
hdd_err("unpack failed, 0x%x", ret);
return -EINVAL;
}
/* Copy out the encryption and authentication types */
hdd_debug("WPA unicast cipher suite count: %d",
dot11_wpa_ie.unicast_cipher_count);
hdd_debug("WPA authentication suite count: %d",
dot11_wpa_ie.auth_suite_count);
/* dot11_wpa_ie.auth_suite_count */
hdd_debug("WPA unicast cipher suite count: %d akm count: %d",
dot11_wpa_ie.unicast_cipher_count,
dot11_wpa_ie.auth_suite_count);
/*
* Translate akms in akm suite
*/
@ -3741,8 +3738,6 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
struct sme_config_params *sme_config;
struct sap_config *sap_config;
hdd_enter();
if (!dev) {
hdd_err("Called with dev = NULL");
return -ENODEV;
@ -3798,9 +3793,6 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
hdd_err("Invalid Channel: %d", channel);
return -EINVAL;
}
hdd_debug("set channel to [%d] for device mode %s(%d)", channel,
qdf_opmode_str(adapter->device_mode),
adapter->device_mode);
if ((adapter->device_mode == QDF_STA_MODE) ||
(adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
@ -3869,7 +3861,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
hdd_err("Invalid device mode failed to set valid channel");
return -EINVAL;
}
hdd_exit();
return status;
}
@ -5056,7 +5048,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
struct hdd_hostapd_state *hostapd_state;
mac_handle_t mac_handle;
int32_t i;
uint32_t ii;
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
uint8_t mcc_to_scc_switch = 0, conc_rule1 = 0;
struct sme_config_params *sme_config;
@ -5183,8 +5174,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
config->dtim_period = beacon->dtim_period;
hdd_debug("acs_mode %d", config->acs_cfg.acs_mode);
if (config->acs_cfg.acs_mode == true) {
hdd_debug("acs_chan_freq %u, acs_dfs_mode %u",
hdd_ctx->acs_policy.acs_chan_freq,
@ -5198,12 +5187,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
policy_mgr_update_user_config_sap_chan(hdd_ctx->psoc,
config->chan_freq);
hdd_debug("config->chan_freq %d, config->acs_dfs_mode %d",
config->chan_freq, config->acs_dfs_mode);
hdd_debug("****config->dtim_period=%d***",
config->dtim_period);
ucfg_policy_mgr_get_mcc_scc_switch(hdd_ctx->psoc, &mcc_to_scc_switch);
if (adapter->device_mode == QDF_SAP_MODE ||
@ -5315,13 +5298,13 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
if (ie) {
/* To access ie[15], length needs to be at least 14 */
if (ie[1] < 14) {
hdd_err("**Wps Ie Length(%hhu) is too small***",
hdd_err("Wps Ie Length(%hhu) is too small",
ie[1]);
ret = -EINVAL;
goto error;
} else if (memcmp(&ie[2], WPS_OUI_TYPE, WPS_OUI_TYPE_SIZE) ==
0) {
hdd_debug("** WPS IE(len %d) ***", (ie[1] + 2));
hdd_debug("WPS IE(len %d)", (ie[1] + 2));
/* Check 15 bit of WPS IE as it contain information for
* wps state
*/
@ -5333,7 +5316,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
}
}
} else {
hdd_debug("WPS disabled");
config->wps_state = SAP_WPS_DISABLED;
}
/* Forward WPS PBC probe request frame up */
@ -5379,14 +5361,13 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
config->mcRSNEncryptType = mc_rsn_encrypt_type;
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
encryption_type = rsn_encrypt_type;
hdd_debug("CSR EncryptionType = %d mcEncryptionType = %d",
rsn_encrypt_type, mc_rsn_encrypt_type);
hdd_debug("CSR AKM Suites %d",
hdd_debug("CSR Encryption: %d mcEncryption: %d num_akm_suites:%d",
rsn_encrypt_type, mc_rsn_encrypt_type,
config->akm_list.numEntries);
for (ii = 0; ii < config->akm_list.numEntries;
ii++)
hdd_debug("CSR AKM Suite [%d] = %d", ii,
config->akm_list.authType[ii]);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD,
QDF_TRACE_LEVEL_DEBUG,
config->akm_list.authType,
config->akm_list.numEntries);
}
}
@ -5432,22 +5413,19 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
config->mcRSNEncryptType = mc_rsn_encrypt_type;
(WLAN_HDD_GET_AP_CTX_PTR(adapter))->
encryption_type = rsn_encrypt_type;
hdd_debug("CSR EncryptionType = %d mcEncryptionType = %d",
rsn_encrypt_type,
mc_rsn_encrypt_type);
hdd_debug("CSR AKM Suites %d",
hdd_debug("CSR Encryption: %d mcEncryption: %d num_akm_suites:%d",
rsn_encrypt_type, mc_rsn_encrypt_type,
config->akm_list.numEntries);
for (ii = 0; ii < config->akm_list.numEntries;
ii++)
hdd_debug("CSR AKM Suite [%d] = %d", ii,
config->akm_list.
authType[ii]);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD,
QDF_TRACE_LEVEL_DEBUG,
config->akm_list.authType,
config->akm_list.numEntries);
}
}
}
if (config->RSNWPAReqIELength > sizeof(config->RSNWPAReqIE)) {
hdd_err("**RSNWPAReqIELength is too large***");
hdd_err("RSNWPAReqIELength is too large");
ret = -EINVAL;
goto error;
}
@ -5460,7 +5438,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
switch (hidden_ssid) {
case NL80211_HIDDEN_SSID_NOT_IN_USE:
hdd_debug("HIDDEN_SSID_NOT_IN_USE");
config->SSIDinfo.ssidHidden = eHIDDEN_SSID_NOT_IN_USE;
break;
case NL80211_HIDDEN_SSID_ZERO_LEN:
@ -5523,12 +5500,15 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
ie++;
for (i = 0;
i < config->supported_rates.numRates; i++) {
if (ie[i]) {
if (ie[i])
config->supported_rates.rate[i] = ie[i];
hdd_debug("Configured Supported rate is %2x",
config->supported_rates.rate[i]);
}
}
hdd_debug("Configured Num Supported rates: %d",
config->supported_rates.numRates);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD,
QDF_TRACE_LEVEL_DEBUG,
config->supported_rates.rate,
config->supported_rates.numRates);
}
ie = wlan_get_ie_ptr_from_eid(WLAN_EID_EXT_SUPP_RATES,
beacon->tail,
@ -5544,12 +5524,16 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
config->extended_rates.numRates = ie[0];
ie++;
for (i = 0; i < config->extended_rates.numRates; i++) {
if (ie[i]) {
if (ie[i])
config->extended_rates.rate[i] = ie[i];
hdd_debug("Configured ext Supported rate is %2x",
config->extended_rates.rate[i]);
}
}
hdd_debug("Configured Num Extended rates: %d",
config->extended_rates.numRates);
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD,
QDF_TRACE_LEVEL_DEBUG,
config->extended_rates.rate,
config->extended_rates.numRates);
}
}
@ -5557,7 +5541,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
wlan_hdd_set_sap_hwmode(adapter);
status = ucfg_mlme_get_vht_for_24ghz(hdd_ctx->psoc, &bval);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
if (QDF_IS_STATUS_ERROR(qdf_status))
hdd_err("Failed to get vht_for_24ghz");
if (WLAN_REG_IS_24GHZ_CH_FREQ(config->chan_freq) && bval &&
@ -5637,14 +5621,13 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
config->mfpCapable, config->mfpRequired);
#endif
hdd_debug("SOftAP macaddress : " QDF_MAC_ADDR_STR,
QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
hdd_debug("ssid =%s, beaconint=%d, ch_freq=%d",
config->SSIDinfo.ssid.ssId, (int)config->beacon_int,
config->chan_freq);
hdd_debug("hw_mode=%x, privacy=%d, authType=%d",
config->SapHw_mode, config->privacy, config->authType);
hdd_debug("RSN/WPALen=%d", (int)config->RSNWPAReqIELength);
hdd_nofl_debug("SAP mac:" QDF_MAC_ADDR_STR " SSID: %.*s BCNINTV:%d Freq:%d HW mode:%d privacy:%d akm:%d acs_mode:%d acs_dfs_mode %d dtim period:%d",
QDF_MAC_ADDR_ARRAY(adapter->mac_addr.bytes),
config->SSIDinfo.ssid.length,
config->SSIDinfo.ssid.ssId, (int)config->beacon_int,
config->chan_freq, config->SapHw_mode, config->privacy,
config->authType, config->acs_cfg.acs_mode,
config->acs_dfs_mode, config->dtim_period);
mutex_lock(&hdd_ctx->sap_lock);
if (cds_is_driver_unloading()) {
@ -5708,8 +5691,6 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
goto error;
}
hdd_debug("Waiting for Scan to complete(auto mode) and BSS to start");
qdf_status = qdf_wait_for_event_completion(&hostapd_state->qdf_event,
SME_CMD_START_BSS_TIMEOUT);
@ -6340,11 +6321,10 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
if (0 != status)
return status;
hdd_debug("adapter = %pK, Device mode %s(%d) sub20 %d",
adapter, qdf_opmode_str(adapter->device_mode),
adapter->device_mode, cds_is_sub_20_mhz_enabled());
hdd_nofl_info("Request to start AP vid %d", adapter->vdev_id);
hdd_nofl_info("%s(vdevid-%d): START AP: Device mode %s(%d) sub20 %d",
dev->name, adapter->vdev_id,
qdf_opmode_str(adapter->device_mode),
adapter->device_mode, cds_is_sub_20_mhz_enabled());
if (policy_mgr_is_hw_mode_change_in_progress(hdd_ctx->psoc)) {
status = policy_mgr_wait_for_connection_update(
hdd_ctx->psoc);
@ -6519,7 +6499,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
if (QDF_STATUS_SUCCESS == status) {
status = policy_mgr_wait_for_connection_update(hdd_ctx->psoc);
if (!QDF_IS_STATUS_SUCCESS(status)) {
hdd_err("ERROR: qdf wait for event failed!!");
hdd_err("qdf wait for event failed!!");
return -EINVAL;
}
}

8
core/mac/src/pe/lim/lim_sme_req_utils.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -358,12 +358,6 @@ bool lim_is_sme_start_bss_req_valid(struct mac_context *mac_ctx,
uint8_t i = 0;
tSirMacRateSet *opr_rates = &start_bss_req->operationalRateSet;
pe_debug("Parsed START_BSS_REQ fields are bssType: %s (%d) chan_freq: %d SSID len: %d rsnIE len: %d nwType: %d rateset len: %d",
lim_bss_type_to_string(start_bss_req->bssType),
start_bss_req->bssType, start_bss_req->oper_ch_freq,
start_bss_req->ssId.length, start_bss_req->rsnIE.length,
start_bss_req->nwType, opr_rates->numRates);
switch (start_bss_req->bssType) {
case eSIR_INFRASTRUCTURE_MODE:
/**

4
core/sap/src/sap_ch_select.c
View file

@ -1340,10 +1340,6 @@ static void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
center_freq0, center_freq1, chan_freq,
spectch_start, spectch_end);
sap_debug("freq = %d, rssi aggr = %d, bss count yet = %d",
chan_freq, pSpectCh->rssiAgr,
pSpectCh->bssCount);
pSpectCh++;
break;

25
core/sap/src/sap_fsm.c
View file

@ -2322,24 +2322,14 @@ static QDF_STATUS sap_fsm_state_init(struct sap_context *sap_ctx,
goto exit;
}
/* Transition from SAP_INIT to SAP_STARTING */
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("new from state %s => %s: session:%d"),
"SAP_INIT", "SAP_STARTING",
sap_ctx->sessionId);
qdf_status = sap_goto_starting(sap_ctx, sap_event,
mac_ctx, mac_handle);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_ERROR,
FL("sap_goto_starting failed"));
if (!QDF_IS_STATUS_ERROR(qdf_status))
sap_err("sap_goto_starting failed");
} else if (msg == eSAP_DFS_CHANNEL_CAC_START) {
qdf_status = sap_fsm_cac_start(sap_ctx, mac_ctx, mac_handle);
} else {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
FL("in state %s, event msg %d"),
"SAP_INIT", msg);
sap_err("in state %s, event msg %d", "SAP_INIT", msg);
}
exit:
@ -2877,8 +2867,7 @@ sapconvert_to_csr_profile(struct sap_config *config, eCsrRoamBssType bssType,
profile->nWPAReqIELength = 0;
if (profile->pRSNReqIE) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
FL("pRSNReqIE already allocated."));
sap_debug("pRSNReqIE already allocated.");
qdf_mem_free(profile->pRSNReqIE);
profile->pRSNReqIE = NULL;
}
@ -2913,7 +2902,6 @@ sapconvert_to_csr_profile(struct sap_config *config, eCsrRoamBssType bssType,
sap_err("Get ap UAPSD enabled/disabled failed");
profile->ApUapsdEnable = sap_uapsd;
sap_debug("Uapsd %d", sap_uapsd);
/* Enable protection parameters */
profile->protEnabled = ucfg_mlme_is_ap_prot_enabled(mac_ctx->psoc);
@ -2924,15 +2912,11 @@ sapconvert_to_csr_profile(struct sap_config *config, eCsrRoamBssType bssType,
sap_err("Get ap obss protection failed");
profile->obssProtEnabled = ap_obss_prot;
sap_debug("ProtEnabled = %d", profile->protEnabled);
sap_debug("OBSSProtEnabled = %d", profile->obssProtEnabled);
qdf_status = ucfg_mlme_get_ap_protection_mode(mac_ctx->psoc, &ap_prot);
if (QDF_IS_STATUS_ERROR(qdf_status))
sap_err("Get ap protection mode failed using default value");
profile->cfg_protection = ap_prot;
sap_debug("cfg_protection = %d", profile->cfg_protection);
/* country code */
if (config->countryCode[0])
qdf_mem_copy(profile->countryCode, config->countryCode,
@ -3010,7 +2994,6 @@ sapconvert_to_csr_profile(struct sap_config *config, eCsrRoamBssType bssType,
if (mcc_to_scc_switch != QDF_MCC_TO_SCC_SWITCH_DISABLE)
profile->chan_switch_hostapd_rate_enabled = false;
}
sap_debug("rate_enabled %d", profile->chan_switch_hostapd_rate_enabled);
return eSAP_STATUS_SUCCESS;
}

23
core/sap/src/sap_module.c
View file

@ -689,19 +689,14 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
int sap_chanswitch_beacon_cnt;
bool sap_chanswitch_mode;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("sap_ctx=%pK"), sap_ctx);
if (!sap_ctx) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
"%s: Invalid SAP pointer",
__func__);
sap_info("Invalid SAP context");
return QDF_STATUS_E_FAULT;
}
pmac = sap_get_mac_context();
if (!pmac) {
sap_err("Invalid MAC context");
sap_err("Invalid sap MAC context");
qdf_status = QDF_STATUS_E_INVAL;
goto fail;
}
@ -737,8 +732,6 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
sap_err("get_auto_channel_weight failed");
sap_ctx->auto_channel_select_weight = auto_channel_select_weight;
sap_debug("auto_channel_select_weight %d",
sap_ctx->auto_channel_select_weight);
sap_ctx->user_context = user_context;
sap_ctx->enableOverLapCh = config->enOverLapCh;
@ -778,16 +771,14 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
sap_chanswitch_beacon_cnt;
pmac->sap.SapDfsInfo.sap_ch_switch_mode =
sap_chanswitch_beacon_cnt;
sap_debug("sap_chanswitch_beacon_cnt:%d", sap_chanswitch_beacon_cnt);
qdf_status = ucfg_mlme_get_sap_channel_switch_mode(
pmac->psoc,
&sap_chanswitch_mode);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
if (QDF_IS_STATUS_ERROR(qdf_status))
sap_err("ucfg_mlme_get_sap_channel_switch_mode, set def");
pmac->sap.SapDfsInfo.sap_ch_switch_mode = sap_chanswitch_mode;
sap_debug("sap_chanswitch_mode:%d", sap_chanswitch_mode);
pmac->sap.SapDfsInfo.sap_ch_switch_mode = sap_chanswitch_mode;
pmac->sap.sapCtxList[sap_ctx->sessionId].sap_context = sap_ctx;
pmac->sap.sapCtxList[sap_ctx->sessionId].sapPersona =
sap_ctx->csr_roamProfile.csrPersona;
@ -800,7 +791,11 @@ QDF_STATUS wlansap_start_bss(struct sap_context *sap_ctx,
pmac->sap.SapDfsInfo.reduced_beacon_interval =
reduced_beacon_interval;
sap_debug("reduced_beacon_interval %d", reduced_beacon_interval);
sap_debug("SAP: auth ch select weight:%d chswitch bcn cnt:%d chswitch mode:%d reduced bcn intv:%d",
sap_ctx->auto_channel_select_weight,
sap_chanswitch_beacon_cnt,
pmac->sap.SapDfsInfo.sap_ch_switch_mode,
pmac->sap.SapDfsInfo.reduced_beacon_interval);
/* Copy MAC filtering settings to sap context */
sap_ctx->eSapMacAddrAclMode = config->SapMacaddr_acl;

3
core/wma/src/wma_dev_if.c
View file

@ -873,9 +873,6 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, struct wlan_objmgr_vdev *vdev,
WMA_LOGD("%s: AP mode (type %d subtype %d) BSS is started",
__func__, wma->interfaces[rsp->vdev_id].type,
wma->interfaces[rsp->vdev_id].sub_type);
WMA_LOGD("%s: Allocated beacon struct %pK, template memory %pK",
__func__, bcn, bcn->buf);
}
send_fail_resp: