diff options
| author | Abhishek Singh <absingh@qti.qualcomm.com> | 2016-03-07 16:07:19 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-03-17 13:11:36 +0530 |
| commit | e6a10822843f840332b6fd1b6ec8b7b171b7d4cd (patch) | |
| tree | 5115d8076fa9bdbb8a219bb1c051f6221400c460 | |
| parent | 229646adce3344698ba23399d4dcfff27f0ca458 (diff) | |
qcacld-2.0: Reduce the info level logs in STA/SAP
Reduce the info level logs in STA/SAP
Change-Id: I5918ea8e9dd2f7654e5a994ad366f92d2ca3cd77
CRs-Fixed: 988195
33 files changed, 202 insertions, 490 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 571bf14b3a7e..148788c2c01f 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -156,8 +156,9 @@ v_VOID_t hdd_connSetConnectionState( hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); /* save the new connection state */ - hddLog(LOG1, FL("ConnectionState Changed from oldState:%d to State:%d"), - pHddStaCtx->conn_info.connState,connState); + hddLog(LOG1, FL("%pS Changed connectionState from oldState:%d to State:%d"), + (void *)_RET_IP_, + pHddStaCtx->conn_info.connState, connState); pHddStaCtx->conn_info.connState = connState; /* Check is pending ROC request or not when connection state changed */ @@ -991,9 +992,6 @@ static eHalStatus hdd_DisConnectHandler( hdd_adapter_t *pAdapter, tCsrRoamInfo * if(pHddStaCtx->conn_info.connState != eConnectionState_Disconnecting) { INIT_COMPLETION(pAdapter->disconnect_comp_var); - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_Disconnecting", - __func__); hdd_connSetConnectionState(pAdapter, eConnectionState_Disconnecting); } @@ -1160,9 +1158,6 @@ static eHalStatus hdd_DisConnectHandler( hdd_adapter_t *pAdapter, tCsrRoamInfo * // Clear saved connection information in HDD hdd_connRemoveConnectInfo( pHddStaCtx ); - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_NotConnected", - __func__); hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); #ifdef WLAN_FEATURE_GTK_OFFLOAD @@ -1598,8 +1593,6 @@ static void hdd_sap_restart_handle(struct work_struct *work) sap_start_work); vos_ssr_protect(__func__); if (0 != wlan_hdd_validate_context(hdd_ctx)) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); vos_ssr_unprotect(__func__); return; } @@ -1669,9 +1662,6 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs } if ( !hddDisconInProgress ) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_Associated", - __func__); hdd_connSetConnectionState(pAdapter, eConnectionState_Associated); } @@ -2064,9 +2054,6 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs */ if ( eCSR_ROAM_ASSOCIATION_FAILURE == roamStatus && !hddDisconInProgress ) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_NotConnected", - __func__); hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); } @@ -2312,9 +2299,6 @@ static void hdd_RoamIbssIndicationHandler( hdd_adapter_t *pAdapter, * connection state to IBSS Disconnected (meaning no peers * are in the IBSS). */ - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_IbssDisconnected", - __func__); hdd_connSetConnectionState(pAdapter, eConnectionState_IbssDisconnected); /* Notify wmm */ @@ -2509,10 +2493,7 @@ static int roamRemoveIbssStation( hdd_adapter_t *pAdapter, v_U8_t staId ) static eHalStatus roamIbssConnectHandler( hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo ) { struct cfg80211_bss *bss; - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: IBSS Connect Indication from SME!!! " - "Set HDD connState to eConnectionState_IbssConnected", - __func__); + hddLog(LOG1, FL("IBSS Connect Indication from SME!!! ")); // Set the internal connection state to show 'IBSS Connected' (IBSS with a partner stations)... hdd_connSetConnectionState(pAdapter, eConnectionState_IbssConnected); @@ -2842,9 +2823,6 @@ static eHalStatus roamRoamConnectStatusUpdateHandler( hdd_adapter_t *pAdapter, t pAdapter->hdd_stats.hddTxRxStats.netq_disable_cnt++; pAdapter->hdd_stats.hddTxRxStats.netq_state_off = TRUE; - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_NotConnected", - __func__); hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); @@ -4486,7 +4464,6 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); tCsrRoamProfile* pRoamProfile = &(pWextState->roamProfile); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - ENTER(); pRoamProfile->AuthType.numEntries = 1; hddLog( LOG1, "%s: pHddStaCtx->conn_info.authType = %d", __func__, pHddStaCtx->conn_info.authType); @@ -4593,7 +4570,6 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) hddLog( LOG1, "%s Set roam Authtype to %d", __func__, pWextState->roamProfile.AuthType.authType[0]); - EXIT(); return 0; } @@ -4784,8 +4760,6 @@ static int __iw_set_essid(struct net_device *dev, */ if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode || WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) { - hddLog(LOG1, - FL("Set HDD connState to eConnectionState_Connecting")); hdd_connSetConnectionState(pAdapter, eConnectionState_Connecting); } diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index 755f0e8c1e1d..db31d74eaefc 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -355,10 +355,8 @@ cb_notify_set_roam_scan_hi_rssi_scan_params(hdd_context_t *hdd_ctx, { int32_t val; - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is invalid")); + if (wlan_hdd_validate_context(hdd_ctx)) return; - } switch (notify_id) { case eCSR_HI_RSSI_SCAN_MAXCOUNT_ID: diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index c3012e0a6f04..608a4661b67f 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -1028,11 +1028,8 @@ static void wlan_hdd_cfg80211_nan_callback(void* ctx, tSirNanEvent* msg) status = wlan_hdd_validate_context(pHddCtx); - if (0 != status) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - FL("HDD context is not valid")); + if (0 != status) return; - } vendor_event = cfg80211_vendor_event_alloc(pHddCtx->wiphy, NULL, @@ -1599,10 +1596,8 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, } ret = wlan_hdd_validate_context(pHddCtx); - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return ret; - } if (FALSE == pHddCtx->cfg_ini->enable_mac_spoofing) { hddLog(LOGW, FL("MAC address spoofing is not enabled")); @@ -1803,10 +1798,8 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } ret = wlan_hdd_validate_context(pHddCtx); - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return -EINVAL; - } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_MAX, data, data_len, @@ -2163,11 +2156,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void* ctx, tStatsExtEvent* msg) status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return; - } pAdapter = hdd_get_adapter_by_vdev( pHddCtx, data->vdev_id); @@ -2281,10 +2270,8 @@ static int wlan_hdd_send_ext_scan_capability(hdd_context_t *hdd_ctx) uint32_t nl_buf_len; ret = wlan_hdd_validate_context(hdd_ctx); - if (0 != ret) { - hddLog(LOGE, FL("hdd_context is invalid")); + if (0 != ret) return ret; - } data = &(hdd_ctx->ext_scan_context.capability_response); @@ -2901,10 +2888,8 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, } retval = wlan_hdd_validate_context(hdd_ctx); - if (0 != retval) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != retval) return -EINVAL; - } if (nla_parse(tb, PARAM_MAX, data, data_len, @@ -4451,10 +4436,9 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, } retval = wlan_hdd_validate_context(hdd_ctx); - if (0 != retval) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != retval) return -EINVAL; - } + if (!hdd_ctx->cfg_ini->extscan_enabled) { hddLog(LOGE, FL("extscan not supported")); return -ENOTSUPP; @@ -6107,11 +6091,7 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - hddLog(VOS_TRACE_LEVEL_ERROR, - FL("HDD context is not valid")); return; - } pAdapter = hdd_get_adapter_by_vdev(pHddCtx, linkLayerStatsResults->ifaceId); @@ -6663,10 +6643,9 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy, } status = wlan_hdd_validate_context(hdd_ctx_ptr); - if (0 != status) { - hddLog(LOGE, FL("HDD context is invalid")); + if (0 != status) return status; - } + sme_UpdateRoamKeyMgmtOffloadEnabled(hdd_ctx_ptr->hHal, hdd_adapter_ptr->sessionId, TRUE); @@ -6742,10 +6721,8 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy, } status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return -EINVAL; - } if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_MAX, data, data_len, qca_wlan_vendor_get_wifi_info_policy)) { @@ -6839,10 +6816,8 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy, } status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return -EINVAL; - } features = 0; @@ -6931,10 +6906,8 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, struct sk_buff *skb = NULL; ENTER(); - if (wlan_hdd_validate_context(hdd_ctx_ptr)) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid ")); + if (wlan_hdd_validate_context(hdd_ctx_ptr)) return -EINVAL; - } skb = cfg80211_vendor_event_alloc(hdd_ctx_ptr->wiphy, NULL, @@ -7559,10 +7532,8 @@ static int __wlan_hdd_cfg80211_disable_dfs_chan_scan(struct wiphy *wiphy, return -EINVAL; } - if ((ret_val = wlan_hdd_validate_context(pHddCtx))) { - hddLog(LOGE, FL("HDD context is not valid")); + if ((ret_val = wlan_hdd_validate_context(pHddCtx))) return ret_val; - } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_SET_NO_DFS_FLAG_MAX, data, data_len, @@ -7985,10 +7956,9 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return status; - } + sap_config = &adapter->sessionCtx.ap.sapConfig; vos_mem_zero(&sap_config->acs_cfg, sizeof(struct sap_acs_cfg)); @@ -8410,10 +8380,8 @@ static int __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, } ret_val = wlan_hdd_validate_context(pHddCtx); - if (ret_val) { - hddLog(LOGE, FL("HDD context is not valid")); + if (ret_val) return ret_val; - } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_CONFIG_MAX, data, data_len, @@ -8662,10 +8630,8 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, } status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return -EINVAL; - } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX, data, data_len, @@ -8763,10 +8729,8 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, return -EINVAL; } - if (0 != wlan_hdd_validate_context(hdd_ctx)) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + if (0 != wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_MAX, data, data_len, qca_wlan_vendor_attr_policy)) { @@ -8977,10 +8941,8 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, } status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return -EINVAL; - } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_GET_RING_DATA_MAX, data, data_len, @@ -9375,10 +9337,8 @@ __wlan_hdd_cfg80211_offloaded_packets(struct wiphy *wiphy, } ret = wlan_hdd_validate_context(hdd_ctx); - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return ret; - } if (!sme_IsFeatureSupportedByFW(WLAN_PERIODIC_TX_PTRN)) { hddLog(LOGE, @@ -9488,10 +9448,8 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, ENTER(); ret = wlan_hdd_validate_context(hdd_ctx); - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return -EINVAL; - } if (!hdd_connIsConnected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) { hddLog(LOGE, FL("Not in Connected state!")); @@ -9612,9 +9570,11 @@ void hdd_rssi_threshold_breached(void *hddctx, ENTER(); - if (wlan_hdd_validate_context(hdd_ctx) || !data) { - hddLog(LOGE, FL("HDD context is invalid or data(%p) is null"), - data); + if (wlan_hdd_validate_context(hdd_ctx)) + return; + + if (!data) { + hddLog(LOGE, FL("data is null")); return; } @@ -9838,12 +9798,13 @@ void hdd_get_bpf_offload_cb(void *hdd_context, ENTER(); - if (wlan_hdd_validate_context(hdd_ctx) || !data) { - hddLog(LOGE, FL("HDD context is invalid or data(%p) is null"), - data); + if (wlan_hdd_validate_context(hdd_ctx)) return; - } + if (!data) { + hddLog(LOGE, FL("Data is null")); + return; + } spin_lock(&hdd_context_lock); context = &bpf_context; @@ -14307,10 +14268,8 @@ static int wlan_hdd_tdls_add_station(struct wiphy *wiphy, ENTER(); ret = wlan_hdd_validate_context(pHddCtx); - if (0 != ret) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + if (0 != ret) return ret; - } if ((eTDLS_SUPPORT_NOT_ENABLED == pHddCtx->tdls_mode) || (eTDLS_SUPPORT_DISABLED == pHddCtx->tdls_mode)) @@ -15596,8 +15555,6 @@ wlan_hdd_cfg80211_inform_bss_frame( hdd_adapter_t *pAdapter, #endif hdd_config_t *cfg_param = NULL; - ENTER(); - pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); if (0 != status) @@ -15710,7 +15667,6 @@ wlan_hdd_cfg80211_inform_bss_frame( hdd_adapter_t *pAdapter, bss_status = cfg80211_inform_bss_frame(wiphy, chan, mgmt, frame_len, rssi, GFP_KERNEL); kfree(mgmt); - EXIT(); return bss_status; } @@ -15771,10 +15727,8 @@ static int wlan_hdd_cfg80211_update_bss( struct wiphy *wiphy, pHddCtx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(pHddCtx); - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return ret; - } if (pAdapter->request != NULL) { @@ -17129,8 +17083,6 @@ int wlan_hdd_cfg80211_connect_start( hdd_adapter_t *pAdapter, if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode || WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) { - hddLog(LOG1, - FL("Set HDD connState to eConnectionState_Connecting")); hdd_connSetConnectionState(pAdapter, eConnectionState_Connecting); } @@ -17218,8 +17170,6 @@ static int wlan_hdd_cfg80211_set_auth_type(hdd_adapter_t *pAdapter, hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - ENTER(); - /*set authentication type*/ switch (auth_type) { @@ -17275,7 +17225,7 @@ static int wlan_hdd_set_akm_suite( hdd_adapter_t *pAdapter, ) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - ENTER(); + /* Should be in ieee802_11_defs.h */ #define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05 #define WLAN_AKM_SUITE_PSK_SHA256 0x000FAC06 @@ -17342,8 +17292,6 @@ static int wlan_hdd_cfg80211_set_cipher( hdd_adapter_t *pAdapter, hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - ENTER(); - if (!cipher) { hddLog(LOG1, FL("received cipher %d - considering none"), cipher); encryptionType = eCSR_ENCRYPT_TYPE_NONE; @@ -17433,7 +17381,6 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, v_U16_t akmsuiteCount; int *akmlist; #endif - ENTER(); /* clear previous assocAddIE */ pWextState->assocAddIE.length = 0; @@ -17690,7 +17637,6 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, genie += eLen; remLen -= eLen; } - EXIT(); return 0; } @@ -17741,7 +17687,6 @@ int wlan_hdd_cfg80211_set_privacy(hdd_adapter_t *pAdapter, { int status = 0; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - ENTER(); /*set wpa version*/ pWextState->wpaVersion = IW_AUTH_WPA_VERSION_DISABLED; @@ -17942,8 +17887,6 @@ static int wlan_hdd_try_disconnect( hdd_adapter_t *pAdapter ) } } disconnected: - hddLog(LOG1, - FL("Set HDD connState to eConnectionState_NotConnected")); hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); return result; @@ -18097,10 +18040,8 @@ int wlan_hdd_disconnect( hdd_adapter_t *pAdapter, u16 reason ) netif_tx_disable(pAdapter->dev); netif_carrier_off(pAdapter->dev); pHddCtx->isAmpAllowed = VOS_TRUE; - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_Disconnecting", - __func__); - pHddStaCtx->conn_info.connState = eConnectionState_Disconnecting; + hdd_connSetConnectionState(pAdapter, + eConnectionState_Disconnecting); INIT_COMPLETION(pAdapter->disconnect_comp_var); /*issue disconnect*/ @@ -18135,8 +18076,6 @@ int wlan_hdd_disconnect( hdd_adapter_t *pAdapter, u16 reason ) } disconnected: - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - FL("Set HDD connState to eConnectionState_NotConnected")); hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); EXIT(); @@ -18236,10 +18175,7 @@ static int __wlan_hdd_cfg80211_disconnect( struct wiphy *wiphy, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return status; - } if (VOS_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); @@ -20785,11 +20721,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, pAdapter->sessionId, action_code)); if (0 != wlan_hdd_validate_context(pHddCtx)) - { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return -EINVAL; - } if (VOS_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); @@ -22000,11 +21932,8 @@ void wlan_hdd_cfg80211_lphb_ind_handler VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "LPHB indication arrived"); - if (0 != wlan_hdd_validate_context((hdd_context_t *)pHddCtx)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: invalid argument pHddCtx", __func__); + if (0 != wlan_hdd_validate_context((hdd_context_t *)pHddCtx)) return; - } if (NULL == lphbInd) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, @@ -22881,12 +22810,13 @@ wlan_hdd_cfg80211_extscan_get_capabilities_rsp(void *ctx, ENTER(); - if (wlan_hdd_validate_context(hdd_ctx) || !data) { - hddLog(LOGE, FL("HDD context is invalid or data(%p) is null"), - data); + if (wlan_hdd_validate_context(hdd_ctx)) return; - } + if (!data) { + hddLog(LOGE, FL("data is null")); + return; + } spin_lock(&hdd_context_lock); context = &hdd_ctx->ext_scan_context; @@ -23381,10 +23311,12 @@ wlan_hdd_cfg80211_extscan_generic_rsp ENTER(); - if (wlan_hdd_validate_context(hdd_ctx) || !response) { + if (wlan_hdd_validate_context(hdd_ctx)) + return; + + if (!response) { hddLog(LOGE, - FL("HDD context is not valid or response(%p) is null"), - response); + FL("response is null")); return; } @@ -23428,13 +23360,14 @@ wlan_hdd_cfg80211_extscan_hotlist_ssid_match_ind(void *ctx, ENTER(); - if (wlan_hdd_validate_context(hdd_ctx) || !event) { + if (wlan_hdd_validate_context(hdd_ctx)) + return; + + if (!event) { hddLog(LOGE, - FL("HDD context is not valid or event(%p) is null"), - event); + FL("event is null")); return; } - if (event->ap_found) { index = QCA_NL80211_VENDOR_SUBCMD_EXTSCAN_HOTLIST_SSID_FOUND_INDEX; hddLog(LOG1, "SSID hotlist found"); @@ -23573,11 +23506,13 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind( ENTER(); - if (wlan_hdd_validate_context(pHddCtx) || !pData) { - hddLog(LOGE, FL("HDD context is invalid or pData(%p) is null"), pData); + if (wlan_hdd_validate_context(pHddCtx)) return; - } + if (!pData) { + hddLog(LOGE, FL("pData is null")); + return; + } skb = cfg80211_vendor_event_alloc(pHddCtx->wiphy, NULL, EXTSCAN_EVENT_BUF_SIZE + NLMSG_HDRLEN, @@ -23834,9 +23769,11 @@ wlan_hdd_cfg80211_extscan_epno_match_found(void *ctx, ENTER(); - if (wlan_hdd_validate_context(pHddCtx) || !data) { - hddLog(LOGE, FL("HDD context is invalid or data(%p) is null"), - data); + if (wlan_hdd_validate_context(pHddCtx)) + return; + + if (!data) { + hddLog(LOGE, FL("data is null")); return; } @@ -24091,9 +24028,12 @@ wlan_hdd_cfg80211_passpoint_match_found(void *ctx, ENTER(); - if (wlan_hdd_validate_context(pHddCtx) || !data) { - hddLog(LOGE, FL("HDD context is invalid or data(%p) is null"), - data); + if (wlan_hdd_validate_context(pHddCtx)) + return; + + if (!data) { + hddLog(LOGE, FL("data is null")); + EXIT(); return; } diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index d7eaf0e67200..0da95f83315e 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -584,10 +584,8 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb, hdd_ctx = container_of(nb, hdd_context_t, ipv6_notifier); status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is invalid")); + if (0 != status) return NOTIFY_DONE; - } adapter = WLAN_HDD_GET_PRIV_PTR(ndev); if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) return NOTIFY_DONE; @@ -1082,10 +1080,7 @@ static void __hdd_ipv4_notifier_work_queue(struct work_struct *work) pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - hddLog(LOGE, FL("HDD context is invalid")); return; - } if ( VOS_FALSE == pHddCtx->sus_res_mcastbcast_filter_valid) { @@ -1131,10 +1126,8 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb, hdd_ctx = container_of(nb, hdd_context_t, ipv4_notifier); status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is invalid")); + if (0 != status) return NOTIFY_DONE; - } adapter = WLAN_HDD_GET_PRIV_PTR(ndev); if (!adapter) return NOTIFY_DONE; diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index b6995887bbf7..7d711851ec92 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -2376,10 +2376,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel) pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(pHddCtx); if (ret) - { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: invalid HDD context", __func__); return ret; - } sta_adapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); /* @@ -2471,11 +2468,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev, pHddCtx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(pHddCtx); if (ret != 0) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return ret; - } VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Received data %s", __func__, extra); @@ -2523,11 +2516,7 @@ static __iw_softap_get_ini_cfg(struct net_device *dev, pHddCtx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(pHddCtx); if (ret != 0) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return ret; - } #ifdef WLAN_FEATURE_MBSSID VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, @@ -2569,11 +2558,8 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev, pHddCtx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(pHddCtx); - if (ret != 0) { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid!", __func__); + if (ret != 0) goto out; - } switch(sub_cmd) { #ifdef DEBUG diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c index 4d662fa7b202..74937c088017 100644 --- a/CORE/HDD/src/wlan_hdd_ipa.c +++ b/CORE/HDD/src/wlan_hdd_ipa.c @@ -1470,10 +1470,8 @@ static void hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event) * When SSR is going on or driver is unloading, just return. */ status = wlan_hdd_validate_context(hdd_ipa->hdd_ctx); - if (0 != status) { - HDD_IPA_LOG(VOS_TRACE_LEVEL_ERROR, "HDD context is not valid"); + if (0 != status) return; - } if (!hdd_ipa_is_rm_enabled(hdd_ipa)) return; @@ -1654,7 +1652,6 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) */ status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { - HDD_IPA_LOG(VOS_TRACE_LEVEL_ERROR, "HDD context is not valid"); adf_os_mem_free(op_msg); return; } @@ -3304,7 +3301,6 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, */ status = wlan_hdd_validate_context(hdd_ipa->hdd_ctx); if (0 != status) { - HDD_IPA_LOG(VOS_TRACE_LEVEL_ERROR, "HDD context is not valid"); ipa_free_skb(ipa_tx_desc); iface_context->stats.num_tx_drop++; return; diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index fe1357546c29..9903263f678f 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -396,11 +396,8 @@ static void hdd_wlan_green_ap_timer_fn(void *phddctx) hdd_green_ap_ctx_t *green_ap; if (0 != wlan_hdd_validate_context(pHddCtx)) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return; - } + green_ap = pHddCtx->green_ap_ctx; if (green_ap) @@ -781,10 +778,8 @@ static void hdd_lost_link_info_cb(void *context, hdd_adapter_t *adapter; status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, "%s: HDD context is not valid", __func__); + if (0 != status) return; - } if (NULL == lost_link_info) { hddLog(LOGE, "%s: lost_link_info is NULL", __func__); @@ -1142,18 +1137,20 @@ int wlan_hdd_validate_context(hdd_context_t *pHddCtx) { if (NULL == pHddCtx || NULL == pHddCtx->cfg_ini) { - hddLog(LOG1, FL("HDD context is Null")); + hddLog(LOG1, FL("%pS HDD context is Null"),(void *)_RET_IP_); return -ENODEV; } if (pHddCtx->isLogpInProgress) { - hddLog(LOG1, FL("LOGP in Progress. Ignore!!!")); + hddLog(LOG1, FL("%pS LOGP in Progress. Ignore!!!"),(void *)_RET_IP_); return -EAGAIN; } if ((pHddCtx->isLoadInProgress) || (pHddCtx->isUnloadInProgress)) { - hddLog(LOG1, FL("Unloading/Loading in Progress. Ignore!!!")); + hddLog(LOG1, + FL("%pS Unloading/Loading in Progress. Ignore!!!"), + (void *)_RET_IP_); return -EAGAIN; } return 0; @@ -3036,10 +3033,9 @@ static void wlan_hdd_ready_to_extwow(void *callbackContext, int rc; rc = wlan_hdd_validate_context(pHddCtx); - if (0 != rc) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + if (0 != rc) return; - } + pHddCtx->ext_wow_should_suspend = is_success; complete(&pHddCtx->ready_to_extwow); } @@ -3098,10 +3094,8 @@ static int hdd_enable_ext_wow_parser(hdd_adapter_t *pAdapter, int vdev_id, int rc; rc = wlan_hdd_validate_context(pHddCtx); - if (0 != rc) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + if (0 != rc) return -EINVAL; - } if (value < EXT_WOW_TYPE_APP_TYPE1 || value > EXT_WOW_TYPE_APP_TYPE1_2 ) { hddLog(VOS_TRACE_LEVEL_ERROR, FL("Invalid type")); @@ -3159,10 +3153,8 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *pAdapter, int rc, i; rc = wlan_hdd_validate_context(pHddCtx); - if (0 != rc) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + if (0 != rc) return -EINVAL; - } if (2 != sscanf(arg, "%8s %16s", id, password)) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, @@ -3219,10 +3211,8 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *pAdapter, int ret; ret = wlan_hdd_validate_context(pHddCtx); - if (0 != ret) { - hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + if (0 != ret) return -EINVAL; - } memset(¶ms, 0, sizeof(tSirAppType2Params)); @@ -3721,10 +3711,8 @@ bool wlan_hdd_get_fw_state(hdd_adapter_t *adapter) unsigned long rc; bool fw_active = true; - if (wlan_hdd_validate_context(hdd_ctx) != 0) { - hddLog(LOGE, FL("HDD context is not valid!!!")); + if (wlan_hdd_validate_context(hdd_ctx) != 0) return false; - } init_completion(&context.completion); context.pAdapter = adapter; @@ -3863,11 +3851,8 @@ int hdd_set_miracast_mode(hdd_adapter_t *pAdapter, tANI_U8 *command) eHalStatus ret_status; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - if (0 != wlan_hdd_validate_context(pHddCtx)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - FL("pHddCtx is not valid, Unable to set miracast mode")); + if (0 != wlan_hdd_validate_context(pHddCtx)) return -EINVAL; - } hHal = pHddCtx->hHal; @@ -4131,11 +4116,8 @@ int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) int ret; ret = wlan_hdd_validate_context(hddctx); - - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return ret; - } if (eConnectionState_Associated != hdd_stactx->conn_info.connState) { /* we are not connected so we don't have a classAstats */ @@ -10173,10 +10155,7 @@ VOS_STATUS hdd_init_station_mode( hdd_adapter_t *pAdapter ) } //Set the Connection State to Not Connected - hddLog(VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_NotConnected", - __func__); - pHddStaCtx->conn_info.connState = eConnectionState_NotConnected; + hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); //Set the default operation channel pHddStaCtx->conn_info.operationChannel = pHddCtx->cfg_ini->OperatingChannel; @@ -10468,10 +10447,8 @@ VOS_STATUS hdd_enable_bmps_imps(hdd_context_t *pHddCtx) { VOS_STATUS status = VOS_STATUS_SUCCESS; - if (0 != wlan_hdd_validate_context(pHddCtx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != wlan_hdd_validate_context(pHddCtx)) return VOS_STATUS_E_PERM; - } if(pHddCtx->cfg_ini->fIsBmpsEnabled) { @@ -11632,13 +11609,10 @@ VOS_STATUS hdd_reconnect_all_adapters( hdd_context_t *pHddCtx ) hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - hddLog(VOS_TRACE_LEVEL_INFO, - "%s: Set HDD connState to eConnectionState_NotConnected", - __func__); if (eConnectionState_Associated == pHddStaCtx->conn_info.connState) { wlan_hdd_decr_active_session(pHddCtx, pAdapter->device_mode); } - pHddStaCtx->conn_info.connState = eConnectionState_NotConnected; + hdd_connSetConnectionState(pAdapter, eConnectionState_NotConnected); init_completion(&pAdapter->disconnect_comp_var); sme_RoamDisconnect(pHddCtx->hHal, pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); @@ -12953,11 +12927,8 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *pAdapter, v_U16_t staId, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return -1; - } + if (!pHddCtx->hHal) return -1; @@ -12993,11 +12964,8 @@ int hdd_wlan_notify_modem_power_state(int state) status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return -1; - } + if (!pHddCtx->hHal) return -1; @@ -16804,11 +16772,8 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter); hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); if (0 != wlan_hdd_validate_context(hdd_ctx)) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return; - } + mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) { #ifdef CFG80211_DEL_STA_V2 @@ -16875,11 +16840,8 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) pConfig = &ap_adapter->sessionCtx.ap.sapConfig; if (0 != wlan_hdd_validate_context(hdd_ctx)) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: HDD context is not valid", __func__); return; - } + mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) goto end; diff --git a/CORE/HDD/src/wlan_hdd_memdump.c b/CORE/HDD/src/wlan_hdd_memdump.c index 3c5ff932acbb..6cc84d264e3f 100644 --- a/CORE/HDD/src/wlan_hdd_memdump.c +++ b/CORE/HDD/src/wlan_hdd_memdump.c @@ -73,10 +73,8 @@ static void memdump_cleanup_timer_cb(void *data) adf_os_device_t adf_ctx; status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return; - } if (!hdd_ctx->fw_dump_loc) { hddLog(LOG1, FL("Memory dump already freed")); @@ -117,10 +115,8 @@ static void wlan_hdd_cfg80211_fw_mem_dump_cb(void *ctx, int status; status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return; - } spin_lock(&hdd_context_lock); context = &fw_dump_context; @@ -153,10 +149,8 @@ static int wlan_hdd_send_memdump_rsp(hdd_context_t *hdd_ctx) int status; status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return status; - } skb = cfg80211_vendor_cmd_alloc_reply_skb(hdd_ctx->wiphy, NLMSG_HDRLEN + NLA_HDRLEN + sizeof(uint32_t)); @@ -216,10 +210,8 @@ __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, } status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is invalid")); + if (0 != status) return status; - } adf_ctx = vos_get_context(VOS_MODULE_ID_ADF, hdd_ctx->pvosContext); if (!adf_ctx) { @@ -417,10 +409,9 @@ static ssize_t memdump_read(struct file *file, char __user *buf, hddLog(LOG1, FL("Read req for size:%zu pos:%llu"), count, *pos); status = wlan_hdd_validate_context(hdd_ctx); - if (0 != status) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != status) return -EINVAL; - } + adf_ctx = vos_get_context(VOS_MODULE_ID_ADF, hdd_ctx->pvosContext); if (!adf_ctx) { hddLog(LOGE, FL("ADF context is NULL")); diff --git a/CORE/HDD/src/wlan_hdd_ocb.c b/CORE/HDD/src/wlan_hdd_ocb.c index 6e814a9f8572..3e2d88987e01 100644 --- a/CORE/HDD/src/wlan_hdd_ocb.c +++ b/CORE/HDD/src/wlan_hdd_ocb.c @@ -593,10 +593,8 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, uint8_t *mac_addr; int i, j; - if (wlan_hdd_validate_context(WLAN_HDD_GET_CTX(adapter))) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(WLAN_HDD_GET_CTX(adapter))) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -918,10 +916,8 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1131,10 +1127,8 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1249,10 +1243,8 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1373,10 +1365,8 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1505,10 +1495,8 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1700,10 +1688,8 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1872,10 +1858,8 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); @@ -1998,10 +1982,8 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, return -EINVAL; } - if (wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (wlan_hdd_validate_context(hdd_ctx)) goto end; - } if (adapter->device_mode != WLAN_HDD_OCB) { hddLog(LOGE, FL("Device not in OCB mode!")); diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c index 14eb877b02b0..3ea48119d52b 100644 --- a/CORE/HDD/src/wlan_hdd_oemdata.c +++ b/CORE/HDD/src/wlan_hdd_oemdata.c @@ -699,10 +699,8 @@ static int oem_msg_callback(struct sk_buff *skb) } ret = wlan_hdd_validate_context(pHddCtx); - if (0 != ret) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != ret) return ret; - } msg_hdr = NLMSG_DATA(nlh); diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c index 8a6a493c1eae..53169e69de9a 100644 --- a/CORE/HDD/src/wlan_hdd_p2p.c +++ b/CORE/HDD/src/wlan_hdd_p2p.c @@ -171,10 +171,8 @@ wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void* pCtx, hdd_remain_on_chan_ctx_t *pRemainChanCtx; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); - if (0 != wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("Invalid HDD context")); + if (0 != wlan_hdd_validate_context(hdd_ctx)) return eHAL_STATUS_FAILURE; - } mutex_lock(&cfgState->remain_on_chan_ctx_lock); pRemainChanCtx = cfgState->remain_on_chan_ctx; @@ -813,10 +811,8 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work) hdd_context_t *hdd_ctx = container_of(work, hdd_context_t, rocReqWork.work); - hddLog(LOG1, FL("going to dequeue roc")); - - if (0 != (wlan_hdd_validate_context(hdd_ctx))) - return; + if (0 != (wlan_hdd_validate_context(hdd_ctx))) + return; /* * The queued roc requests is dequeued and processed one at a time. @@ -827,7 +823,6 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work) spin_lock(&hdd_ctx->hdd_roc_req_q.lock); if (list_empty(&hdd_ctx->hdd_roc_req_q.anchor)) { spin_unlock(&hdd_ctx->hdd_roc_req_q.lock); - hddLog(LOG1, FL("list is empty")); return; } status = hdd_list_remove_front(&hdd_ctx->hdd_roc_req_q, diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c index 01b54eb52b9b..155e0bee4de2 100644 --- a/CORE/HDD/src/wlan_hdd_tdls.c +++ b/CORE/HDD/src/wlan_hdd_tdls.c @@ -1015,11 +1015,7 @@ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, pHddCtx = WLAN_HDD_GET_CTX(curr_peer->pHddTdlsCtx->pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) - { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - FL("pHddCtx is not valid")); return; - } hddLog(VOS_TRACE_LEVEL_WARN, "tdls set peer " MAC_ADDRESS_STR " link status to %u", MAC_ADDR_ARRAY(curr_peer->peerMac), status); @@ -1071,11 +1067,7 @@ void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) - { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - FL("pHddCtx is not valid")); return; - } curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, TRUE); if (curr_peer == NULL) @@ -2430,11 +2422,7 @@ void wlan_hdd_tdls_implicit_send_discovery_request(tdlsCtx_t * pHddTdlsCtx) pHddCtx = WLAN_HDD_GET_CTX(pHddTdlsCtx->pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) - { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - FL("pHddCtx is not valid")); return; - } mutex_lock(&pHddCtx->tdls_lock); @@ -2962,11 +2950,9 @@ wlan_hdd_tdls_find_first_connected_peer(hdd_adapter_t *pAdapter) tdlsCtx_t *pHddTdlsCtx; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - if (0 != (wlan_hdd_validate_context(pHddCtx))) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - FL("pHddCtx is not valid")); + if (0 != (wlan_hdd_validate_context(pHddCtx))) return NULL; - } + mutex_lock(&pHddCtx->tdls_lock); pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); if (NULL == pHddTdlsCtx) { diff --git a/CORE/HDD/src/wlan_hdd_tsf.c b/CORE/HDD/src/wlan_hdd_tsf.c index 07c11bebcb29..f9df7b160da6 100644 --- a/CORE/HDD/src/wlan_hdd_tsf.c +++ b/CORE/HDD/src/wlan_hdd_tsf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -204,11 +204,8 @@ static int hdd_get_tsf_cb(void *pcb_cxt, struct stsf *ptsf) hddctx = (hdd_context_t *)pcb_cxt; status = wlan_hdd_validate_context(hddctx); - if (0 != status) { - hddLog(VOS_TRACE_LEVEL_ERROR, - FL("hdd context is not valid")); + if (0 != status) return -EINVAL; - } adapter = hdd_get_adapter_by_vdev(hddctx, ptsf->vdev_id); diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index 4c7eb8d09f5e..1296ac7cc932 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -8640,10 +8640,7 @@ static int __iw_get_char_setnone(struct net_device *dev, pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); if (0 != status) - { - hddLog(LOGE, "%s: getSNR: HDD context is not valid", __func__); return status; - } pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c index 4cf038274875..e0a21f6f8626 100644 --- a/CORE/HDD/src/wlan_hdd_wmm.c +++ b/CORE/HDD/src/wlan_hdd_wmm.c @@ -1274,10 +1274,8 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) pAdapter = pQosContext->pAdapter; hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); - if (0 != wlan_hdd_validate_context(hdd_ctx)) { - hddLog(LOGE, FL("HDD context is not valid")); + if (0 != wlan_hdd_validate_context(hdd_ctx)) return; - } acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c index 4dba015af9b6..d6bafa7c9f12 100644 --- a/CORE/MAC/src/pe/lim/limApi.c +++ b/CORE/MAC/src/pe/lim/limApi.c @@ -1434,15 +1434,11 @@ VOS_STATUS peHandleMgmtFrame( v_PVOID_t pvosGCtx, v_PVOID_t vosBuff) mHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo); if(mHdr->fc.type == SIR_MAC_MGMT_FRAME) { - PELOG1(limLog( pMac, LOG1, - FL("RxBd=%p mHdr=%p Type: %d Subtype: %d Sizes:FC%d Mgmt%d"), - pRxPacketInfo, mHdr, mHdr->fc.type, mHdr->fc.subType, - sizeof(tSirMacFrameCtl), sizeof(tSirMacMgmtHdr));) - - limLog(pMac, LOG1, FL("mpdu_len:%d hdr_len:%d data_len:%d"), - WDA_GET_RX_MPDU_LEN(pRxPacketInfo), - WDA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo), - WDA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)); + limLog(pMac, LOG2, + FL("Type: %d Subtype: %d from: " MAC_ADDRESS_STR " with Seq no %d"), + mHdr->fc.type, mHdr->fc.subType, MAC_ADDR_ARRAY(mHdr->sa), + ((mHdr->seqControl.seqNumHi << 4) | + (mHdr->seqControl.seqNumLo))); #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (WDA_GET_ROAMCANDIDATEIND(pRxPacketInfo)) @@ -1472,8 +1468,6 @@ VOS_STATUS peHandleMgmtFrame( v_PVOID_t pvosGCtx, v_PVOID_t vosBuff) { vos_pkt_return_packet(pVosPkt); pVosPkt = NULL; - limLog( pMac, LOGW, - FL ( "sysBbtProcessMessageCore failed to process SIR_BB_XPORT_MGMT_MSG" )); return VOS_STATUS_E_FAILURE; } diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c index 9cb74d6aecae..3a4667db662f 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c @@ -2262,7 +2262,7 @@ limProcessMlmJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) else { //No need to suspend link. - limLog(pMac,LOG1,"SessionId:%d Join request on current channel", + limLog(pMac,LOG2,"SessionId:%d Join request on current channel", sessionId); limProcessMlmPostJoinSuspendLink( pMac, eHAL_STATUS_SUCCESS, (tANI_U32*) psessionEntry ); diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c index eb0383a0c888..2043b1d0f508 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c @@ -5051,9 +5051,6 @@ void limProcessRxScanEvent(tpAniSirGlobal pMac, void *buf) { tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf; - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - "scan_id = %u", pScanEvent->scanId); - switch (pScanEvent->event) { case LIM_SCAN_EVENT_STARTED: diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 016353e93939..7e01eaed5268 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -1334,9 +1334,6 @@ static eHalStatus limSendHalStartScanOffloadReq(tpAniSirGlobal pMac, pMac->lim.fOffloadScanPending = 1; if (pScanReq->p2pSearch) pMac->lim.fOffloadScanP2PSearch = 1; - - limLog(pMac, LOG1, FL("Processed Offload Scan Request Successfully")); - return eHAL_STATUS_SUCCESS; } @@ -1841,8 +1838,6 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) limDiagEventReport(pMac, WLAN_PE_DIAG_JOIN_REQ_EVENT, NULL, 0, 0); #endif //FEATURE_WLAN_DIAG_SUPPORT - PELOG1(limLog(pMac, LOG1, FL("Received SME_JOIN_REQ"));) - /** * Expect Join request in idle state. * Reassociate request is expected in link established state. @@ -1927,7 +1922,7 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) goto end; } else - limLog(pMac,LOG1,FL("SessionId:%d New session created"), + limLog(pMac,LOG2,FL("SessionId:%d New session created"), sessionId); } psessionEntry->max_amsdu_num = pSmeJoinReq->max_amsdu_num; @@ -1993,17 +1988,8 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) */ psessionEntry->supported_nss_1x1 = true; - limLog(pMac, LOG1, - FL("enableHtSmps: %d htSmps: %d supported NSS 1x1: %d"), - psessionEntry->enableHtSmps, - psessionEntry->htSmpsvalue, - psessionEntry->supported_nss_1x1); - /*Store Persona */ psessionEntry->pePersona = pSmeJoinReq->staPersona; - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - FL("PE PERSONA=%d cbMode %u"), psessionEntry->pePersona, - pSmeJoinReq->cbMode); /* Copy The channel Id to the session Table */ psessionEntry->currentOperChannel = pSmeJoinReq->bssDescription.channelId; @@ -2016,12 +2002,17 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) else psessionEntry->vdev_nss = vdev_type_nss->sta; - limLog(pMac, LOG1, FL("persona - %d, nss - %d"), - psessionEntry->pePersona, psessionEntry->vdev_nss); + limLog(pMac, LOG1, + FL("persona: %d, nss: %d cbMode: %d enableHtSmps: %d htSmps: %d supported NSS 1x1: %d"), + psessionEntry->pePersona, + psessionEntry->vdev_nss, + pSmeJoinReq->cbMode, + psessionEntry->enableHtSmps, + psessionEntry->htSmpsvalue, + psessionEntry->supported_nss_1x1); + #ifdef WLAN_FEATURE_11AC psessionEntry->vhtCapability = IS_DOT11_MODE_VHT(psessionEntry->dot11mode); - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED, - "***__limProcessSmeJoinReq: vhtCapability=%d****",psessionEntry->vhtCapability); if (psessionEntry->vhtCapability ) { if (psessionEntry->pePersona == VOS_STA_MODE) @@ -2035,36 +2026,34 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) psessionEntry->txMuBformee = pSmeJoinReq->txMuBformee; psessionEntry->enableVhtpAid = pSmeJoinReq->enableVhtpAid; psessionEntry->enableVhtGid = pSmeJoinReq->enableVhtGid; - - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED, - "***__limProcessSmeJoinReq: txBFIniFeatureEnabled=%d****", - psessionEntry->txBFIniFeatureEnabled); - if( psessionEntry->txBFIniFeatureEnabled ) { - if (cfgSetInt(pMac, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, psessionEntry->txBFIniFeatureEnabled) + if (cfgSetInt(pMac, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, + psessionEntry->txBFIniFeatureEnabled) != eSIR_SUCCESS) { - limLog(pMac, LOGP, FL("could not set " + limLog(pMac, LOGE, FL("could not set " "WNI_CFG_VHT_SU_BEAMFORMEE_CAP at CFG")); retCode = eSIR_LOGP_EXCEPTION; goto end; } - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED, - "***__limProcessSmeJoinReq: txBFCsnValue=%d****", - pSmeJoinReq->txBFCsnValue); - - if (cfgSetInt(pMac, WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED, pSmeJoinReq->txBFCsnValue) + if (cfgSetInt(pMac, WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED, + pSmeJoinReq->txBFCsnValue) != eSIR_SUCCESS) { - limLog(pMac, LOGP, FL("could not set " + limLog(pMac, LOGE, FL("could not set " "WNI_CFG_VHT_CSN_BEAMFORMEE_ANT_SUPPORTED at CFG")); retCode = eSIR_LOGP_EXCEPTION; goto end; } } } - + limLog(pMac, LOG1, + FL("vhtCapability: %d txBFIniFeatureEnabled: %d txBFCsnValue: %d txMuBformee: %d"), + psessionEntry->vhtCapability, + psessionEntry->txBFIniFeatureEnabled, + pSmeJoinReq->txBFCsnValue, + psessionEntry->txMuBformee); #endif /*Phy mode*/ @@ -2240,21 +2229,12 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) #else psessionEntry->maxTxPower = VOS_MIN( regMax, (localPowerConstraint) ); #endif - VOS_TRACE( VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - "Regulatory max = %d, local power constraint = %d," - " max tx = %d", regMax, localPowerConstraint, - psessionEntry->maxTxPower ); - if(!pMac->psOffloadEnabled) { if (pMac->lim.gLimCurrentBssUapsd) { pMac->lim.gUapsdPerAcBitmask = psessionEntry->pLimJoinReq->uapsdPerAcBitmask; - limLog( pMac, LOG1, - FL("UAPSD flag for all AC - 0x%2x"), - pMac->lim.gUapsdPerAcBitmask); - // resetting the dynamic uapsd mask pMac->lim.gUapsdPerAcDeliveryEnableMask = 0; pMac->lim.gUapsdPerAcTriggerEnableMask = 0; @@ -2266,15 +2246,16 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) { psessionEntry->gUapsdPerAcBitmask = psessionEntry->pLimJoinReq->uapsdPerAcBitmask; - limLog( pMac, LOG1, - FL("UAPSD flag for all AC - 0x%2x"), - psessionEntry->gUapsdPerAcBitmask); - /* resetting the dynamic uapsd mask */ psessionEntry->gUapsdPerAcDeliveryEnableMask = 0; psessionEntry->gUapsdPerAcTriggerEnableMask = 0; } } + limLog(pMac, LOG1, + FL("regMax = %d, localPowerConstraint = %d, max tx = %d, UAPSD flag for all AC - 0x%2x"), + regMax, localPowerConstraint, + psessionEntry->maxTxPower, + psessionEntry->gUapsdPerAcBitmask); psessionEntry->limRFBand = limGetRFBand(psessionEntry->currentOperChannel); @@ -2300,12 +2281,6 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) psessionEntry->limSmeState = eLIM_SME_WT_JOIN_STATE; MTRACE(macTrace(pMac, TRACE_CODE_SME_STATE, psessionEntry->peSessionId, psessionEntry->limSmeState)); - limLog(pMac, LOG1, FL("SME JoinReq:Sessionid %d SSID len %d SSID : %s " - "Channel %d, BSSID "MAC_ADDRESS_STR), pMlmJoinReq->sessionId, - psessionEntry->ssId.length,psessionEntry->ssId.ssId, - psessionEntry->currentOperChannel, - MAC_ADDR_ARRAY(psessionEntry->bssId)); - /* Indicate whether spectrum management is enabled*/ psessionEntry->spectrumMgtEnabled = pSmeJoinReq->spectrumMgtIndicator; @@ -2318,8 +2293,6 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) psessionEntry->isOSENConnection = pSmeJoinReq->isOSENConnection; - PELOG1(limLog(pMac,LOG1,FL("SessionId:%d MLM_JOIN_REQ is posted to MLM SM"), - pMlmJoinReq->sessionId);); /* Issue LIM_MLM_JOIN_REQ to MLM */ limPostMlmMessage(pMac, LIM_MLM_JOIN_REQ, (tANI_U32 *) pMlmJoinReq); return; diff --git a/CORE/MAC/src/pe/lim/limPropExtsUtils.c b/CORE/MAC/src/pe/lim/limPropExtsUtils.c index 047eb5b8cbf9..730c339b1c23 100644 --- a/CORE/MAC/src/pe/lim/limPropExtsUtils.c +++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.c @@ -120,12 +120,11 @@ limExtractApCapability(tpAniSirGlobal pMac, tANI_U8 *pIE, tANI_U16 ieLen, pMac->lim.htCapabilityPresentInBeacon = 0; #ifdef WLAN_FEATURE_11AC - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED, - "***beacon.VHTCaps.present*****=%d BSS_VHT_CAPABLE:%d", + limLog(pMac, LOG1, + FL("Beacon : VHTCaps.present: %d SU Beamformer: %d, IS_BSS_VHT_CAPABLE: %d"), pBeaconStruct->VHTCaps.present, + pBeaconStruct->VHTCaps.suBeamFormerCap, IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps)); - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED, - "***beacon.SU Beamformer Capable*****=%d",pBeaconStruct->VHTCaps.suBeamFormerCap); if (IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) && pBeaconStruct->VHTOperation.present) { diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c index 88ebd6577980..ed04db70f821 100644 --- a/CORE/MAC/src/pe/lim/limScanResultUtils.c +++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c @@ -259,9 +259,10 @@ limCollectBssDescription(tpAniSirGlobal pMac, pBssDescr->tsf_delta = WDA_GET_RX_TSF_DELTA(pRxPacketInfo); limLog(pMac, LOG1, - FL("BSSID: "MAC_ADDRESS_STR " rssi: normalized = %d, absolute = %d tsf_delta = %u"), + FL("BSSID: "MAC_ADDRESS_STR " rssi: normalized = %d, absolute = %d tsf_delta = %u seq %d"), MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi, pBssDescr->rssi_raw, - pBssDescr->tsf_delta); + pBssDescr->tsf_delta, ((pHdr->seqControl.seqNumHi << 4) | + (pHdr->seqControl.seqNumLo))); #if defined WLAN_FEATURE_VOWIFI if( fScanning ) diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c index 89f98c9e5ae0..09bb7ff4f818 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c @@ -970,7 +970,7 @@ limSendSmeScanRsp(tpAniSirGlobal pMac, tANI_U16 length, vos_mem_copy( (tANI_U8 *) &pDesc->bssId, (tANI_U8 *) &ptemp->bssDescription.bssId, ptemp->bssDescription.length); - limLog(pMac, LOG1, FL("ScanRsp : msgLen %d, bssDescr Len=%d BssID "MAC_ADDRESS_STR), + limLog(pMac, LOG2, FL("ScanRsp : msgLen %d, bssDescr Len=%d BssID "MAC_ADDRESS_STR), msgLen, ptemp->bssDescription.length, MAC_ADDR_ARRAY(ptemp->bssDescription.bssId)); diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 7907f67806c5..f8fad2b4daa8 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -8459,7 +8459,7 @@ eHalStatus lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, DOT11F_EID_EXTCAP, num_bytes); temp = ext_cap_data.bytes; for (i=0; i < num_bytes; i++, temp++) - limLog(mac_ctx, LOG1, FL("%d byte is %02x"), i+1, *temp); + limLog(mac_ctx, LOG2, FL("%d byte is %02x"), i+1, *temp); vdev_ie->data = (uint8_t *)vdev_ie + sizeof(*vdev_ie); vos_mem_copy(vdev_ie->data, ext_cap_data.bytes, num_bytes); diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 958aac8f8b0b..70ae24011c32 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -588,10 +588,6 @@ static inline uint16_t mcs_rate_match(uint16_t match_rate, bool *is_sgi, uint8_t nss, uint16_t nss1_rate, uint16_t nss1_srate, uint16_t nss2_rate, uint16_t nss2_srate) { - WMA_LOGD("%s match_rate: %d, %d %d %d %d", - __func__, match_rate, nss1_rate, nss1_srate, nss2_rate, - nss2_srate); - if (match_rate == nss1_rate) return nss1_rate; else if (match_rate == nss1_srate) { @@ -3073,7 +3069,6 @@ static int wma_stats_event_handler(void *handle, u_int8_t *cmd_param_info, vos_mem_free(buf); return -1; } - WMA_LOGD("WDA_FW_STATS_IND posted"); return 0; } @@ -3228,8 +3223,6 @@ static void wma_fw_stats_ind(tp_wma_handle wma, u_int8_t *buf) wmi_mib_stats *mib_stats; u_int8_t i, *temp; - WMA_LOGI("%s: Enter", __func__); - temp = buf + sizeof(*event); WMA_LOGD("%s: num_stats: pdev: %u vdev: %u peer %u mib %u", @@ -3275,8 +3268,6 @@ static void wma_fw_stats_ind(tp_wma_handle wma, u_int8_t *buf) temp += sizeof(wmi_mib_stats); } } - - WMA_LOGI("%s: Exit", __func__); } #ifdef FEATURE_WLAN_EXTSCAN @@ -7697,7 +7688,6 @@ static int wmi_unified_peer_create_send(wmi_unified_t wmi, adf_nbuf_free(buf); return -EIO; } - WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); return 0; } @@ -9510,13 +9500,8 @@ VOS_STATUS wma_update_channel_list(WMA_HANDLE handle, vos_chan_to_freq(chan_list->chanParam[i].chanId); chan_info->band_center_freq1 = chan_info->mhz; chan_info->band_center_freq2 = 0; - - WMA_LOGD("chan[%d] = %u", i, chan_info->mhz); if (chan_list->chanParam[i].dfsSet) { WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PASSIVE); - WMA_LOGI("chan[%d] DFS[%d]\n", - chan_list->chanParam[i].chanId, - chan_list->chanParam[i].dfsSet); } if (chan_list->chanParam[i].half_rate) { @@ -9546,7 +9531,8 @@ VOS_STATUS wma_update_channel_list(WMA_HANDLE handle, WMI_SET_CHANNEL_REG_POWER(chan_info, chan_list->chanParam[i].pwr); - WMA_LOGD("Channel TX power[%d] = %u: %d", i, chan_info->mhz, + WMA_LOGD(FL("Channel %u[%d] DFS[%d] TX power = %d "), + chan_info->mhz, i, chan_list->chanParam[i].dfsSet, chan_list->chanParam[i].pwr); /*TODO: Set WMI_SET_CHANNEL_MIN_POWER */ /*TODO: Set WMI_SET_CHANNEL_ANTENNA_MAX */ @@ -14024,8 +14010,6 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, wma->vos_context); struct qpower_params *qparams = &intr[vid].config.qpower_params; - WMA_LOGD("wmihandle %p", wma->wmi_handle); - if (NULL == pMac) { WMA_LOGE("%s: Failed to get pMac", __func__); return; @@ -28845,7 +28829,6 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg) ol_txrx_vdev_handle txrx_vdev_handle = NULL; extern tANI_U8* macTraceGetWdaMsgString( tANI_U16 wdaMsg ); - WMA_LOGI("%s: Enter", __func__); if(NULL == msg) { WMA_LOGE("msg is NULL"); VOS_ASSERT(0); @@ -28853,7 +28836,8 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg) goto end; } - WMA_LOGD("msg->type = %x %s", msg->type, macTraceGetWdaMsgString(msg->type)); + WMA_LOGD(FL(" msg->type = %x %s"), + msg->type, macTraceGetWdaMsgString(msg->type)); wma_handle = (tp_wma_handle) vos_get_context(VOS_MODULE_ID_WDA, vos_context); @@ -29697,7 +29681,6 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg) } } end: - WMA_LOGI("%s: Exit", __func__); return vos_status ; } @@ -34293,13 +34276,8 @@ static int wma_update_tdls_peer_state(WMA_HANDLE handle, chan_info->band_center_freq1 = chan_info->mhz; chan_info->band_center_freq2 = 0; - WMA_LOGD("%s: chan[%d] = %u", __func__, i, chan_info->mhz); - if (peerStateParams->peerCap.peerChan[i].dfsSet) { WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PASSIVE); - WMA_LOGI("chan[%d] DFS[%d]\n", - peerStateParams->peerCap.peerChan[i].chanId, - peerStateParams->peerCap.peerChan[i].dfsSet); } if (chan_info->mhz < WMA_2_4_GHZ_MAX_FREQ) { @@ -34313,7 +34291,9 @@ static int wma_update_tdls_peer_state(WMA_HANDLE handle, WMI_SET_CHANNEL_REG_POWER(chan_info, peerStateParams->peerCap.peerChan[i].pwr); - WMA_LOGD("Channel TX power[%d] = %u: %d", i, chan_info->mhz, + WMA_LOGD(FL("Channel %u[%d] DFS[%d] TX power = %d"), + chan_info->mhz, i, + peerStateParams->peerCap.peerChan[i].dfsSet, peerStateParams->peerCap.peerChan[i].pwr); chan_info++; diff --git a/CORE/SME/src/ccm/ccmApi.c b/CORE/SME/src/ccm/ccmApi.c index 8b2c358d5678..ec9ea366f085 100644 --- a/CORE/SME/src/ccm/ccmApi.c +++ b/CORE/SME/src/ccm/ccmApi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -420,7 +420,7 @@ void ccmCfgCnfMsgHandler(tHalHandle hHal, void *m) result = pal_be32_to_cpu(msg->data[0]); cfgId = pal_be32_to_cpu(msg->data[1]); - smsLog(pMac, LOG1, FL("started=%d, cfgId=%d, in_progress=%d"), + smsLog(pMac, LOG2, FL("started=%d, cfgId=%d, in_progress=%d"), pMac->ccm.replay.started, cfgId, pMac->ccm.replay.in_progress); if (pMac->ccm.replay.started && cfgId == CFG_UPDATE_MAGIC_DWORD) diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index fdf4916b4e53..f6d7c1aeb3a3 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -8509,7 +8509,6 @@ static void csrRoamingStateConfigCnfProcessor( tpAniSirGlobal pMac, tANI_U32 res { if ( CCM_IS_RESULT_SUCCESS(result) ) { - smsLog(pMac, LOG1, "Cfg sequence complete"); // Successfully set the configuration parameters for the new Bss. Attempt to // join the roaming Bss. if(pCommand->u.roamCmd.pRoamBssEntry) @@ -9801,7 +9800,7 @@ eHalStatus csrRoamPrepareFilterFromProfile(tpAniSirGlobal pMac, tCsrRoamProfile pScanFilter->SSIDs.numOfSSIDs = 1; } VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG, - FL("No of Allowed List:%d"), roam_params->num_ssid_allowed_list); + FL("No of Allowed List:%d"), roam_params->num_ssid_allowed_list); if (pScanFilter->scan_filter_for_roam && roam_params->num_ssid_allowed_list) { pScanFilter->SSIDs.numOfSSIDs = @@ -13694,8 +13693,8 @@ eHalStatus csrSendJoinReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDe pBuf++; } smsLog(pMac, LOGE, - "Connecting to ssid:%.*s bssid: " - MAC_ADDRESS_STR" rssi: %d channel: %d country_code: %c%c", + FL("Connecting to ssid:%.*s bssid: " + MAC_ADDRESS_STR" rssi: %d channel: %d country_code: %c%c"), pIes->SSID.num_ssid, pIes->SSID.ssid, MAC_ADDR_ARRAY(pBssDescription->bssId), pBssDescription->rssi, pBssDescription->channelId, @@ -15032,7 +15031,7 @@ eHalStatus csrSendMBSetContextReqMsg( tpAniSirGlobal pMac, tANI_U32 sessionId, vos_mem_copy(p, pKey, keyLength); smsLog(pMac, LOG1, FL("SME set keyIndx (%d) encType (%d) key"), keyId, edType); - sirDumpBuf(pMac, SIR_SMS_MODULE_ID, LOG1, pKey, keyLength); + sirDumpBuf(pMac, SIR_SMS_MODULE_ID, LOG2, pKey, keyLength); } status = palSendMBMessage(pMac->hHdd, pMsg); } while( 0 ); diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index a4735a67e28e..c6847d919546 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -3657,7 +3657,6 @@ void csrApplyChannelPowerCountryInfo( tpAniSirGlobal pMac, tCsrChannel *pChannel #ifdef FEATURE_WLAN_SCAN_PNO if (updateRiva) { - VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, FL(" Sending 11d PNO info to Riva")); // Send HAL UpdateScanParams message pmcUpdateScanParams(pMac, &(pMac->roam.configParam), &ChannelList, TRUE); } @@ -4887,7 +4886,7 @@ tCsrScanResult *csrScanSaveBssDescriptionToInterimList( tpAniSirGlobal pMac, { vos_mem_set(pCsrBssDescription, cbAllocated, 0); pCsrBssDescription->AgingCount = (tANI_S32)pMac->roam.configParam.agingCount; - smsLog(pMac, LOGW, + smsLog(pMac, LOG2, FL(" Set Aging Count = %d for BSS "MAC_ADDRESS_STR" "), pCsrBssDescription->AgingCount, MAC_ADDR_ARRAY(pBSSDescription->bssId)); @@ -5700,7 +5699,7 @@ eHalStatus csrScanAgeResults(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInf else { pResult->AgingCount--; - smsLog(pMac, LOGW, + smsLog(pMac, LOG2, FL("Decremented AgingCount=%d for BSS "MAC_ADDRESS_STR""), pResult->AgingCount, MAC_ADDR_ARRAY(pResult->Result.BssDescriptor.bssId)); @@ -5911,7 +5910,7 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, for(i = 0; i < pMsg->channelList.numChannels; i++) { - smsLog(pMac, LOG1, FL("channelNumber[%d]= %d"), i, pMsg->channelList.channelNumber[i]); + smsLog(pMac, LOG2, FL("channelNumber[%d]= %d"), i, pMsg->channelList.channelNumber[i]); } if(HAL_STATUS_SUCCESS(status)) diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index 017db0ac0971..334f82a7f24f 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -3143,7 +3143,7 @@ tANI_BOOLEAN csrLookupPMKID( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U8 *p { for (Index = 0; Index < CSR_MAX_PMKID_ALLOWED; Index++) { - smsLog(pMac, LOG1, "match PMKID "MAC_ADDRESS_STR " to ", + smsLog(pMac, LOG2, "match PMKID "MAC_ADDRESS_STR " to ", MAC_ADDR_ARRAY(pBSSId)); if( vos_mem_compare(pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid)) ) { diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c index 15e6344559cf..9d791ec1e29b 100644 --- a/CORE/SME/src/pmc/pmcApi.c +++ b/CORE/SME/src/pmc/pmcApi.c @@ -2983,8 +2983,6 @@ eHalStatus pmcUpdateScanParams(tHalHandle hHal, tCsrConfig *pRequest, tCsrChanne vos_msg_t msg; int i; - VOS_TRACE( VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, "%s started", __func__); - pRequestBuf = vos_mem_malloc(sizeof(tSirUpdateScanParams)); if (NULL == pRequestBuf) { @@ -3003,9 +3001,6 @@ eHalStatus pmcUpdateScanParams(tHalHandle hHal, tCsrConfig *pRequest, tCsrChanne for (i=0; i < pRequestBuf->ucChannelCount; i++) { - VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "%s: Channel List %d: %d", __FUNCTION__, i, pChannelList->channelList[i] ); - pRequestBuf->aChannels[i] = pChannelList->channelList[i]; } pRequestBuf->usPassiveMinChTime = pRequest->nPassiveMinChnTime; diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 434ae670a616..cb100fcf0bd8 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -753,7 +753,7 @@ tANI_BOOLEAN smeProcessScanQueue(tpAniSirGlobal pMac) /* if there is an active SME command, do not process * the pending scan cmd */ - smsLog(pMac, LOGE, "SME scan cmd is pending on session %d", + smsLog(pMac, LOG1, "SME scan cmd is pending on session %d", pSmeCommand->sessionId); status = eANI_BOOLEAN_FALSE; goto end; @@ -1268,14 +1268,10 @@ sme_process_cmd: csrScanStartIdleScanTimer(pMac, nTime); } } - VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "No Pending command waiting"); } } else { csrLLUnlock( &pMac->sme.smeCmdActiveList ); - VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "Active list command waiting"); } sme_process_scan_queue: diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c index 56573eb43109..3947b83ac181 100644 --- a/CORE/SME/src/sme_common/sme_FTApi.c +++ b/CORE/SME/src/sme_common/sme_FTApi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -107,8 +107,6 @@ void sme_FTClose(tHalHandle hHal, tANI_U32 sessionId) } if (pSession->ftSmeContext.pUsrCtx != NULL) { - smsLog(pMac, LOG1, - FL("Freeing ftSmeContext.pUsrCtx and setting to NULL")); vos_mem_free(pSession->ftSmeContext.pUsrCtx); pSession->ftSmeContext.pUsrCtx = NULL; } diff --git a/CORE/SYS/legacy/src/platform/src/VossWrapper.c b/CORE/SYS/legacy/src/platform/src/VossWrapper.c index 56a5a72e6002..78526678063b 100644 --- a/CORE/SYS/legacy/src/platform/src/VossWrapper.c +++ b/CORE/SYS/legacy/src/platform/src/VossWrapper.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2013, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -140,16 +140,11 @@ v_UINT_t tx_timer_activate(TX_TIMER *timer_ptr) // Check for an uninitialized timer VOS_ASSERT(0 != strlen(TIMER_NAME)); - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, - "Timer %s being activated\n", TIMER_NAME); - status = vos_timer_start( &timer_ptr->vosTimer, timer_ptr->initScheduleTimeInMsecs ); if (VOS_STATUS_SUCCESS == status) { - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, - "Timer %s now activated\n", TIMER_NAME); return TX_SUCCESS; } else if (VOS_STATUS_E_ALREADY == status) @@ -457,8 +452,6 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr, v_UINT_t tx_timer_deactivate(TX_TIMER *timer_ptr) { VOS_STATUS vStatus; - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, - "tx_timer_deactivate() called for timer %s\n", TIMER_NAME); // Put a check for the free builds if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) @@ -481,9 +474,6 @@ v_UINT_t tx_timer_deactivate(TX_TIMER *timer_ptr) v_UINT_t tx_timer_delete( TX_TIMER *timer_ptr ) { - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, - "tx_timer_delete() called for timer %s\n", TIMER_NAME); - // Put a check for the free builds if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) { @@ -514,9 +504,6 @@ v_UINT_t tx_timer_delete( TX_TIMER *timer_ptr ) */ v_BOOL_t tx_timer_running(TX_TIMER *timer_ptr) { - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO, - "tx_timer_running() called for timer %s\n", TIMER_NAME); - // Put a check for the free builds if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) return VOS_FALSE; diff --git a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c index dd7131302801..d75166d5695c 100644 --- a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c +++ b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -132,9 +132,9 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, goto fail; } - PELOG3(sysLog(pMac, LOG3, FL("Rx Mgmt Frame Subtype: %d\n"), subType); + sysLog(pMac, LOG3, FL("Rx Mgmt Frame Subtype: %d\n"), subType); sirDumpBuf(pMac, SIR_SYS_MODULE_ID, LOG3, (tANI_U8 *)WDA_GET_RX_MAC_HEADER(pBd), WDA_GET_RX_MPDU_LEN(pBd)); - sirDumpBuf(pMac, SIR_SYS_MODULE_ID, LOG3, WDA_GET_RX_MPDU_DATA(pBd), WDA_GET_RX_PAYLOAD_LEN(pBd));) + sirDumpBuf(pMac, SIR_SYS_MODULE_ID, LOG3, WDA_GET_RX_MPDU_DATA(pBd), WDA_GET_RX_PAYLOAD_LEN(pBd)); pMac->sys.gSysFrameCount[type][subType]++; framecount = pMac->sys.gSysFrameCount[type][subType]; @@ -149,7 +149,7 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, if (psessionEntry && (psessionEntry->pePersona == VOS_STA_SAP_MODE)) { - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO_HIGH, + sysLog(pMac, LOG1, FL("CAC timer is running, dropping the mgmt frame")); goto fail; } @@ -163,24 +163,24 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, (!limIsSystemInScanState(pMac)) && (true != GET_LIM_PROCESS_DEFD_MESGS(pMac)) && !pMac->lim.gLimSystemInScanLearnMode) { - VOS_TRACE(VOS_MODULE_ID_SYS, VOS_TRACE_LEVEL_INFO_HIGH, + sysLog(pMac, LOG1, FL("dropping received beacon in deffered state")); goto fail; } dropReason = limIsPktCandidateForDrop(pMac, pBd, subType); if (dropReason != eMGMT_DROP_NO_DROP) { - PELOG1(sysLog(pMac, LOG1, + sysLog(pMac, LOG1, FL("Mgmt Frame %d being dropped, reason: %d\n"), - subType, dropReason);) - MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT_DROP, NO_SESSION, dropReason);) + subType, dropReason); + MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT_DROP, NO_SESSION, dropReason)); goto fail; } if (subType == SIR_MAC_MGMT_DEAUTH) { tpSirMacMgmtHdr pMacHdr = WDA_GET_RX_MAC_HEADER(pBd); - PELOGE(sysLog( pMac, LOGE, + sysLog(pMac, LOGE, FL("DEAUTH frame allowed: " "da: " MAC_ADDRESS_STR ", " "sa: " MAC_ADDRESS_STR ", " @@ -189,12 +189,12 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, MAC_ADDR_ARRAY(pMacHdr->da), MAC_ADDR_ARRAY(pMacHdr->sa), MAC_ADDR_ARRAY(pMacHdr->bssId), - pMac->sys.gSysFrameCount[type][subType] );); + pMac->sys.gSysFrameCount[type][subType]); } if (subType == SIR_MAC_MGMT_DISASSOC) { tpSirMacMgmtHdr pMacHdr = WDA_GET_RX_MAC_HEADER(pBd); - PELOGE(sysLog( pMac, LOGE, + sysLog(pMac, LOGE, FL("DISASSOC frame allowed: " "da: " MAC_ADDRESS_STR ", " "sa: " MAC_ADDRESS_STR ", " @@ -203,7 +203,7 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, MAC_ADDR_ARRAY(pMacHdr->da), MAC_ADDR_ARRAY(pMacHdr->sa), MAC_ADDR_ARRAY(pMacHdr->bssId), - pMac->sys.gSysFrameCount[type][subType] );); + pMac->sys.gSysFrameCount[type][subType]); } //Post the message to PE Queue @@ -212,7 +212,8 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, { /* Print only one debug failure out of 512 failure messages */ if(pMac->sys.gSysBbtReceived & 0x0200) - sysLog(pMac, LOGE, FL("posting to LIM2 failed, ret %d\n"), ret); + sysLog(pMac, LOGE, + FL("posting to LIM2 failed, ret %d"), ret); goto fail; } pMac->sys.gSysBbtPostedToLim++; @@ -220,12 +221,12 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, else if (type == SIR_MAC_DATA_FRAME) { #ifdef FEATURE_WLAN_ESE - PELOGW(sysLog(pMac, LOGW, FL("IAPP Frame...\n"));); + sysLog(pMac, LOGW, FL("IAPP Frame...\n")); //Post the message to PE Queue ret = (tSirRetStatus) limPostMsgApi(pMac, pMsg); if (ret != eSIR_SUCCESS) { - PELOGE(sysLog(pMac, LOGE, FL("posting to LIM2 failed, ret %d\n"), ret);) + sysLog(pMac, LOGE, FL("posting to LIM2 failed, ret %d\n"), ret); goto fail; } pMac->sys.gSysBbtPostedToLim++; @@ -233,11 +234,11 @@ sysBbtProcessMessageCore(tpAniSirGlobal pMac, tpSirMsgQ pMsg, tANI_U32 type, } else { - PELOG3(sysLog(pMac, LOG3, "BBT received Invalid type %d subType %d " + sysLog(pMac, LOG3, "BBT received Invalid type %d subType %d " "LIM state %X. BD dump is:\n", type, subType, limGetSmeState(pMac)); sirDumpBuf(pMac, SIR_SYS_MODULE_ID, LOG3, - (tANI_U8 *) pBd, WLANHAL_RX_BD_HEADER_SIZE);) + (tANI_U8 *) pBd, WLANHAL_RX_BD_HEADER_SIZE); goto fail; } |