diff options
| -rw-r--r-- | core/cds/src/cds_utils.c | 4 | ||||
| -rw-r--r-- | core/dp/txrx/ol_txrx.c | 6 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_assoc.c | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_power.c | 7 | ||||
| -rw-r--r-- | core/wma/src/wma_scan_roam.c | 2 |
6 files changed, 14 insertions, 9 deletions
diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index fdb9affec658..6fb86c194db0 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2019 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 @@ -754,7 +754,7 @@ void cds_copy_hlp_info(struct qdf_mac_addr *input_dst_mac, uint8_t *output_hlp_data) { if (!input_hlp_data_len) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_DEBUG, "Input HLP data len zero\n"); return; } diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index d9a8a341819d..630d27168381 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2019 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 @@ -3753,7 +3753,7 @@ int ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer, qdf_spin_unlock_bh(&pdev->peer_map_unmap_lock); } else { qdf_spin_unlock_bh(&pdev->peer_ref_mutex); - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, "[%s][%d]: ref delete peer %pK peer->ref_cnt = %d", fname, line, peer, rc); } @@ -3876,7 +3876,7 @@ void ol_txrx_peer_detach(ol_txrx_peer_handle peer, bool start_peer_unmap_timer) /* debug print to dump rx reorder state */ /* htt_rx_reorder_log_print(vdev->pdev->htt_pdev); */ - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, "%s:peer %pK (%02x:%02x:%02x:%02x:%02x:%02x)", __func__, peer, peer->mac_addr.raw[0], peer->mac_addr.raw[1], diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index f6369c94d69c..32bb9454f378 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1395,7 +1395,7 @@ static void hdd_send_association_event(struct net_device *dev, } } #endif - pr_info("wlan: " MAC_ADDRESS_STR " connected to " + hdd_info("wlan: " MAC_ADDRESS_STR " connected to " MAC_ADDRESS_STR "\n", MAC_ADDR_ARRAY(pAdapter->macAddressCurrent.bytes), MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data)); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index a89f80696a24..06cb8799fcad 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -11405,7 +11405,7 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy, } } - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, "%s STATS_SET_START Received flag %d!!", __func__, arp_stats_params.flag); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 09549fb4dd94..7d42532877c4 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 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 @@ -2488,6 +2488,11 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return -EINVAL; } + if (sta_ctx->hdd_ReassocScenario) { + hdd_debug("Roaming is in progress, rej this req"); + return -EINVAL; + } + mutex_lock(&pHddCtx->iface_change_lock); if (pHddCtx->driver_status != DRIVER_MODULES_ENABLED) { mutex_unlock(&pHddCtx->iface_change_lock); diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index b96d8da646d8..6ffa17ce40f4 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -3081,7 +3081,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, __func__); goto cleanup_label; } - WMA_LOGI("LFR3: Received WMA_ROAM_OFFLOAD_SYNCH_IND"); + WMA_LOGD("LFR3: Received WMA_ROAM_OFFLOAD_SYNCH_IND"); /* * All below length fields are unsigned and hence positive numbers. |