From 7d1e90244638906341cd548ac840e92721d824a4 Mon Sep 17 00:00:00 2001
From: Ecco Park <eccopark@google.com>
Date: Fri, 10 Nov 2017 17:54:47 +0000
Subject: [PATCH] Revert "qcacld-2.0: Add more logs to debug how device got the
default MAC address"
This reverts commit fac512559def0a9eff62ee1baec1c954e89bfe7a.
Bug: 67493651
Change-Id: Ic1e1ea5d4485bf429f795fdb9a30278e0aeac0c8
---
.../staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_hostapd.c | 3 ---
drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c | 9 ---------
drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c | 4 +---
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_hostapd.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_hostapd.c
index f1e3e1b93ad5..d2e8d58f6cdb 100644
--- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -6737,9 +6737,6 @@ hdd_adapter_t* hdd_wlan_create_ap_dev( hdd_context_t *pHddCtx, tSirMacAddr macAd
vos_mem_copy(pWlanHostapdDev->dev_addr, (void *)macAddr,sizeof(tSirMacAddr));
vos_mem_copy(pHostapdAdapter->macAddressCurrent.bytes, (void *)macAddr, sizeof(tSirMacAddr));
- hddLog(VOS_TRACE_LEVEL_ERROR, "mac adress for AP mode "
- MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr));
-
pHostapdAdapter->offloads_configured = FALSE;
pWlanHostapdDev->destructor = free_netdev;
pWlanHostapdDev->ieee80211_ptr = &pHostapdAdapter->wdev ;
diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
index 44dcd10391a1..ecd9fc559367 100755
--- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
+++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_main.c
@@ -9675,12 +9675,6 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
ENTER();
- hddLog(VOS_TRACE_LEVEL_ERROR, "Inside __hdd_set_mac_address %p", addr);
- if (addr)
- hddLog(VOS_TRACE_LEVEL_ERROR, "mac adress "
- MAC_ADDRESS_STR, MAC_ADDR_ARRAY((char *)addr));
-
-
hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(hdd_ctx);
if (0 != ret)
@@ -10073,9 +10067,6 @@ static hdd_adapter_t* hdd_alloc_station_adapter( hdd_context_t *pHddCtx, tSirMac
vos_mem_copy(pWlanDev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr));
vos_mem_copy( pAdapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr));
- hddLog(VOS_TRACE_LEVEL_ERROR, "mac adress for STA mode "
- MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr));
-
pWlanDev->watchdog_timeo = HDD_TX_TIMEOUT;
/*
* kernel will consume ethernet header length buffer for hard_header,
diff --git a/drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c b/drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c
index fa5be5e59ea6..86fb1058f211 100644
--- a/drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c
+++ b/drivers/staging/qcacld-2.0/CORE/SERVICES/WMA/wma.c
@@ -8408,10 +8408,8 @@ static ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle,
txrx_vdev_type);
wma_handle->interfaces[self_sta_req->sessionId].pause_bitmap = 0;
- WMA_LOGE("vdev_id %hu, txrx_vdev_handle = %pK", self_sta_req->sessionId,
+ WMA_LOGD("vdev_id %hu, txrx_vdev_handle = %p", self_sta_req->sessionId,
txrx_vdev_handle);
- WMA_LOGE("mac adress "
- MAC_ADDRESS_STR, MAC_ADDR_ARRAY(self_sta_req->selfMacAddr));
if (NULL == txrx_vdev_handle) {
WMA_LOGP("%s: ol_txrx_vdev_attach failed", __func__);
--
GitLab