commit f5f0e0843420828be4b06b1d38ee6516aad8a0c9
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Thu Dec 14 21:28:46 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Dec 14 21:28:46 2017 -0800
tree 6be8e64f95bd7d263b526c2b69b59c98c1108155
parent c649af1dfe644bcfbc3fa0eeaebb3176176b20cd
parent 0ad9a3cc0ae9e90279323593e4f4b9b2e91f1fe8

Merge "wlan: Fix cb mode for 40 Mhz while selecting cb mode from ecsa" into wlan-driver.lnx.1.0-dev.1.0

CORE/HDD/src/wlan_hdd_assoc.c

diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 7810c4b..5cb9f38 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1154,10 +1154,10 @@
              }
         }
 #endif
-        hddLog(VOS_TRACE_LEVEL_INFO, MAC_ADDRESS_STR " connected to "
-                MAC_ADDRESS_STR,
-                MAC_ADDR_ARRAY(pAdapter->macAddressCurrent.bytes),
-                MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
+	hddLog(VOS_TRACE_LEVEL_ERROR, MAC_ADDRESS_STR " connected to "
+	       MAC_ADDRESS_STR,
+	       MAC_ADDR_ARRAY(pAdapter->macAddressCurrent.bytes),
+	       MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
         hdd_SendUpdateBeaconIEsEvent(pAdapter, pCsrRoamInfo);
 
         hdd_manage_delack_timer(pHddCtx);

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 5359919..0021b51 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -10189,8 +10189,8 @@
    if (staChannel > 0 && (apChannel > 0 || p2pChannel > 0)) {
        ccMode = (p2pChannel==staChannel||apChannel==staChannel) ? "SCC" : "MCC";
    }
-   hddLog(VOS_TRACE_LEVEL_INFO, "wlan(%d) " MAC_ADDRESS_STR " %s",
-                staChannel, MAC_ADDR_ARRAY(staBssid), ccMode);
+   hddLog(VOS_TRACE_LEVEL_ERROR, "wlan(%d) " MAC_ADDRESS_STR " %s",
+	  staChannel, MAC_ADDR_ARRAY(staBssid), ccMode);
    if (p2pChannel > 0) {
        hddLog(VOS_TRACE_LEVEL_ERROR, "p2p-%s(%d) " MAC_ADDRESS_STR,
                      p2pMode, p2pChannel, MAC_ADDR_ARRAY(p2pBssid));