diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-09 19:08:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-09 19:08:06 -0800 |
| commit | bbd53da11a4833f8709be25c6e7609c73b3caa2b (patch) | |
| tree | 9589cd680f59a214e71fdd20e5ba62678f023ff2 | |
| parent | e36803af9e50945ea23412709efdd1295e1fd381 (diff) | |
| parent | 149dc5c537ab09e6865b0b027dfc67281e852967 (diff) | |
Merge "Merge remote-tracking branch 'origin/caf/caf-wlan/master'"
54 files changed, 648 insertions, 1071 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_queue.c b/CORE/CLD_TXRX/TXRX/ol_tx_queue.c index cea3006b9b92..a8141edf8485 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx_queue.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx_queue.c @@ -521,8 +521,11 @@ ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev) adf_os_spin_unlock(&pdev->tx_queue_spinlock); #endif /* defined(CONFIG_HL_SUPPORT) */ } else { - vdev->ll_pause.is_paused = A_FALSE; - ol_tx_vdev_ll_pause_queue_send(vdev); + if (vdev->ll_pause.is_paused) + { + vdev->ll_pause.is_paused = A_FALSE; + ol_tx_vdev_ll_pause_queue_send(vdev); + } } TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__); } diff --git a/CORE/CLD_TXRX/TXRX/ol_txrx.c b/CORE/CLD_TXRX/TXRX/ol_txrx.c index e8217c7f4813..6d632683966c 100644 --- a/CORE/CLD_TXRX/TXRX/ol_txrx.c +++ b/CORE/CLD_TXRX/TXRX/ol_txrx.c @@ -827,6 +827,7 @@ ol_txrx_vdev_attach( } #endif /* defined(CONFIG_HL_SUPPORT) */ + adf_os_spinlock_init(&vdev->ll_pause.mutex); vdev->ll_pause.is_paused = A_FALSE; vdev->ll_pause.txq.head = vdev->ll_pause.txq.tail = NULL; vdev->ll_pause.txq.depth = 0; diff --git a/CORE/HDD/inc/wlan_hdd_ipa.h b/CORE/HDD/inc/wlan_hdd_ipa.h index aaac547e70ce..843f9d58fcd3 100644 --- a/CORE/HDD/inc/wlan_hdd_ipa.h +++ b/CORE/HDD/inc/wlan_hdd_ipa.h @@ -42,7 +42,7 @@ Include files -------------------------------------------------------------------------*/ #ifdef IPA_OFFLOAD -#include <mach/ipa.h> +#include <linux/ipa.h> VOS_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); VOS_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 30dc08dd1d77..acc91cd0a868 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -641,13 +641,8 @@ static void hdd_SendAssociationEvent(struct net_device *dev,tCsrRoamInfo *pCsrRo } } #endif - pr_info("wlan: connected to %02x:%02x:%02x:%02x:%02x:%02x\n", - wrqu.ap_addr.sa_data[0], - wrqu.ap_addr.sa_data[1], - wrqu.ap_addr.sa_data[2], - wrqu.ap_addr.sa_data[3], - wrqu.ap_addr.sa_data[4], - wrqu.ap_addr.sa_data[5]); + pr_info("wlan: connected to " MAC_ADDRESS_STR"\n", + MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data)); hdd_SendUpdateBeaconIEsEvent(pAdapter, pCsrRoamInfo); /* Send IWEVASSOCRESPIE Event if WLAN_FEATURE_CIQ_METRICS is Enabled Or @@ -683,13 +678,8 @@ static void hdd_SendAssociationEvent(struct net_device *dev,tCsrRoamInfo *pCsrRo { memcpy(wrqu.ap_addr.sa_data, pHddStaCtx->conn_info.bssId, ETH_ALEN); type = WLAN_STA_ASSOC_DONE_IND; - pr_info("wlan: new IBSS connection to %02x:%02x:%02x:%02x:%02x:%02x", - pHddStaCtx->conn_info.bssId[0], - pHddStaCtx->conn_info.bssId[1], - pHddStaCtx->conn_info.bssId[2], - pHddStaCtx->conn_info.bssId[3], - pHddStaCtx->conn_info.bssId[4], - pHddStaCtx->conn_info.bssId[5]); + pr_info("wlan: new IBSS connection to " MAC_ADDRESS_STR"\n", + MAC_ADDR_ARRAY(pHddStaCtx->conn_info.bssId)); } else /* Not Associated */ { @@ -1511,17 +1501,15 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); if (pRoamInfo) - pr_info("wlan: connection failed with %02x:%02x:%02x:%02x:%02x:%02x" - " reason:%d and Status:%d\n", pRoamInfo->bssid[0], - pRoamInfo->bssid[1], pRoamInfo->bssid[2], - pRoamInfo->bssid[3], pRoamInfo->bssid[4], - pRoamInfo->bssid[5], roamResult, roamStatus); + pr_info("wlan: connection failed with " MAC_ADDRESS_STR + " reason:%d and Status:%d\n", + MAC_ADDR_ARRAY(pRoamInfo->bssid), + roamResult, roamStatus); else - pr_info("wlan: connection failed with %02x:%02x:%02x:%02x:%02x:%02x" - " reason:%d and Status:%d\n", pWextState->req_bssId[0], - pWextState->req_bssId[1], pWextState->req_bssId[2], - pWextState->req_bssId[3], pWextState->req_bssId[4], - pWextState->req_bssId[5], roamResult, roamStatus); + pr_info("wlan: connection failed with " MAC_ADDRESS_STR + " reason:%d and Status:%d\n", + MAC_ADDR_ARRAY(pWextState->req_bssId), + roamResult, roamStatus); /*Handle all failure conditions*/ hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected); @@ -1966,13 +1954,8 @@ static eHalStatus hdd_RoamMicErrorIndicationHandler( hdd_adapter_t *pAdapter, tC memset(&msg, '\0', sizeof(msg)); msg.src_addr.sa_family = ARPHRD_ETHER; memcpy(msg.src_addr.sa_data, pRoamInfo->u.pMICFailureInfo->taMacAddr, sizeof(pRoamInfo->u.pMICFailureInfo->taMacAddr)); - hddLog(LOG1, "MIC MAC %02x:%02x:%02x:%02x:%02x:%02x", - msg.src_addr.sa_data[0], - msg.src_addr.sa_data[1], - msg.src_addr.sa_data[2], - msg.src_addr.sa_data[3], - msg.src_addr.sa_data[4], - msg.src_addr.sa_data[5]); + hddLog(LOG1, "MIC MAC " MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(msg.src_addr.sa_data)); if(pRoamInfo->u.pMICFailureInfo->multicast == eSIR_TRUE) msg.flags = IW_MICFAILURE_GROUP; @@ -2289,7 +2272,7 @@ eHalStatus hdd_RoamTdlsStatusUpdateHandler(hdd_adapter_t *pAdapter, #ifdef WLAN_FEATURE_TDLS_DEBUG VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("hdd_tdlsStatusUpdate: %s staIdx %d %02x:%02x:%02x:%02x:%02x:%02x \n"), + ("hdd_tdlsStatusUpdate: %s staIdx %d " MAC_ADDRESS_STR), roamResult == eCSR_ROAM_RESULT_ADD_TDLS_PEER ? "ADD_TDLS_PEER" : roamResult == eCSR_ROAM_RESULT_DELETE_TDLS_PEER ? "DEL_TDLS_PEER" : roamResult == eCSR_ROAM_RESULT_TEARDOWN_TDLS_PEER_IND ? "DEL_TDLS_PEER_IND" : @@ -2303,12 +2286,7 @@ eHalStatus hdd_RoamTdlsStatusUpdateHandler(hdd_adapter_t *pAdapter, #endif "UNKNOWN", pRoamInfo->staId, - pRoamInfo->peerMac[0], - pRoamInfo->peerMac[1], - pRoamInfo->peerMac[2], - pRoamInfo->peerMac[3], - pRoamInfo->peerMac[4], - pRoamInfo->peerMac[5]) ; + MAC_ADDR_ARRAY(pRoamInfo->peerMac)) ; #endif #ifdef QCA_WIFI_2_0 @@ -2344,15 +2322,10 @@ eHalStatus hdd_RoamTdlsStatusUpdateHandler(hdd_adapter_t *pAdapter, pHddCtx->tdlsConnInfo[staIdx].staId = pRoamInfo->staId; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, - ("TDLS: STA IDX at %d is %d " - "of mac %02x:%02x:%02x:%02x:%02x:%02x"), + ("TDLS: STA IDX at %d is %d " + "of mac " MAC_ADDRESS_STR), staIdx, pHddCtx->tdlsConnInfo[staIdx].staId, - pRoamInfo->peerMac[0], - pRoamInfo->peerMac[1], - pRoamInfo->peerMac[2], - pRoamInfo->peerMac[3], - pRoamInfo->peerMac[4], - pRoamInfo->peerMac[5]) ; + MAC_ADDR_ARRAY(pRoamInfo->peerMac)); vos_copy_macaddr(&pHddCtx->tdlsConnInfo[staIdx].peerMac, (v_MACADDR_t *)pRoamInfo->peerMac) ; @@ -2470,14 +2443,9 @@ eHalStatus hdd_RoamTdlsStatusUpdateHandler(hdd_adapter_t *pAdapter, pHddCtx->tdlsConnInfo[staIdx].staId) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, - ("hdd_tdlsStatusUpdate: staIdx %d %02x:%02x:%02x:%02x:%02x:%02x"), + ("hdd_tdlsStatusUpdate: staIdx %d " MAC_ADDRESS_STR), pHddCtx->tdlsConnInfo[staIdx].staId, - pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[0], - pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[1], - pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[2], - pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[3], - pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[4], - pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes[5]) ; + MAC_ADDR_ARRAY(pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes)); wlan_hdd_tdls_reset_peer(pAdapter, pHddCtx->tdlsConnInfo[staIdx].peerMac.bytes); hdd_roamDeregisterTDLSSTA ( pAdapter, pHddCtx->tdlsConnInfo[staIdx].staId ); wlan_hdd_tdls_decrement_peer_count(pAdapter); @@ -4016,8 +3984,8 @@ int iw_set_ap_address(struct net_device *dev, v_U8_t *pMacAddress=NULL; ENTER(); pMacAddress = (v_U8_t*) wrqu->ap_addr.sa_data; - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%02x:%02x:%02x:%02x:%02x:%02x",pMacAddress[0],pMacAddress[1], - pMacAddress[2],pMacAddress[3],pMacAddress[4],pMacAddress[5]); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s "MAC_ADDRESS_STR, + __func__, MAC_ADDR_ARRAY(pMacAddress)); vos_mem_copy( pHddStaCtx->conn_info.bssId, pMacAddress, sizeof( tCsrBssid )); EXIT(); @@ -4174,13 +4142,8 @@ void hdd_indicateCckmPreAuth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) /* Timestamp0 is lower 32 bits and Timestamp1 is upper 32 bits */ hddLog(VOS_TRACE_LEVEL_INFO, - "CCXPREAUTHNOTIFY=%02x:%02x:%02x:%02x:%02x:%02x %u:%u", - pRoamInfo->bssid[0], - pRoamInfo->bssid[1], - pRoamInfo->bssid[2], - pRoamInfo->bssid[3], - pRoamInfo->bssid[4], - pRoamInfo->bssid[5], + "CCXPREAUTHNOTIFY=" MAC_ADDRESS_STR" %lu:%lu", + MAC_ADDR_ARRAY(pRoamInfo->bssid), pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]); diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index 4d71b707cb41..ee4ec3e5d0bf 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -3296,48 +3296,25 @@ static void print_hdd_cfg(hdd_context_t *pHddCtx) VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [AutoBmpsTimerEnabled] Value = [%u]",pHddCtx->cfg_ini->fIsAutoBmpsTimerEnabled); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [nAutoBmpsTimerValue] Value = [%u]",pHddCtx->cfg_ini->nAutoBmpsTimerValue); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [nVccRssiTrigger] Value = [%u]",pHddCtx->cfg_ini->nVccRssiTrigger); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssBssid] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]", - pHddCtx->cfg_ini->IbssBssid.bytes[0],pHddCtx->cfg_ini->IbssBssid.bytes[1], - pHddCtx->cfg_ini->IbssBssid.bytes[2],pHddCtx->cfg_ini->IbssBssid.bytes[3], - pHddCtx->cfg_ini->IbssBssid.bytes[4],pHddCtx->cfg_ini->IbssBssid.bytes[5]); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "Name = [Intf0MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]", - pHddCtx->cfg_ini->intfMacAddr[0].bytes[0], - pHddCtx->cfg_ini->intfMacAddr[0].bytes[1], - pHddCtx->cfg_ini->intfMacAddr[0].bytes[2], - pHddCtx->cfg_ini->intfMacAddr[0].bytes[3], - pHddCtx->cfg_ini->intfMacAddr[0].bytes[4], - pHddCtx->cfg_ini->intfMacAddr[0].bytes[5]); - + "Name = [gIbssBssid] Value =["MAC_ADDRESS_STR"]", + MAC_ADDR_ARRAY(pHddCtx->cfg_ini->IbssBssid.bytes)); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "Name = [Intf1MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]", - pHddCtx->cfg_ini->intfMacAddr[1].bytes[0], - pHddCtx->cfg_ini->intfMacAddr[1].bytes[1], - pHddCtx->cfg_ini->intfMacAddr[1].bytes[2], - pHddCtx->cfg_ini->intfMacAddr[1].bytes[3], - pHddCtx->cfg_ini->intfMacAddr[1].bytes[4], - pHddCtx->cfg_ini->intfMacAddr[1].bytes[5]); + "Name = [Intf0MacAddress] Value =["MAC_ADDRESS_STR"]", + MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[0].bytes)); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "Name = [Intf2MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]", - pHddCtx->cfg_ini->intfMacAddr[2].bytes[0], - pHddCtx->cfg_ini->intfMacAddr[2].bytes[1], - pHddCtx->cfg_ini->intfMacAddr[2].bytes[2], - pHddCtx->cfg_ini->intfMacAddr[2].bytes[3], - pHddCtx->cfg_ini->intfMacAddr[2].bytes[4], - pHddCtx->cfg_ini->intfMacAddr[2].bytes[5]); + "Name = [Intf1MacAddress] Value =["MAC_ADDRESS_STR"]", + MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[1].bytes)); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "Name = [Intf3MacAddress] Value =[0x%x 0x%x 0x%x 0x%x 0x%x 0x%x]", - pHddCtx->cfg_ini->intfMacAddr[3].bytes[0], - pHddCtx->cfg_ini->intfMacAddr[3].bytes[1], - pHddCtx->cfg_ini->intfMacAddr[3].bytes[2], - pHddCtx->cfg_ini->intfMacAddr[3].bytes[3], - pHddCtx->cfg_ini->intfMacAddr[3].bytes[4], - pHddCtx->cfg_ini->intfMacAddr[3].bytes[5]); + "Name = [Intf2MacAddress] Value =["MAC_ADDRESS_STR"]", + MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[2].bytes)); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, + "Name = [Intf3MacAddress] Value =["MAC_ADDRESS_STR"]", + MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[3].bytes)); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]\n",pHddCtx->cfg_ini->apUapsdEnabled); @@ -4354,9 +4331,8 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) if ( VOS_FALSE == vos_is_macaddr_group( &pConfig->IbssBssid )) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_MED, - "MAC Addr (IBSS BSSID) read from Registry is: %02x-%02x-%02x-%02x-%02x-%02x", - pConfig->IbssBssid.bytes[0], pConfig->IbssBssid.bytes[1], pConfig->IbssBssid.bytes[2], - pConfig->IbssBssid.bytes[3], pConfig->IbssBssid.bytes[4], pConfig->IbssBssid.bytes[5]); + "MAC Addr (IBSS BSSID) read from Registry is: " MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pConfig->IbssBssid.bytes)); if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, pConfig->IbssBssid.bytes, sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 216bec3d2d25..bf04268a1afc 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -3092,14 +3092,8 @@ int wlan_hdd_cfg80211_change_iface( struct wiphy *wiphy, ndev->dev_addr[3] |= 0xF0; memcpy(pAdapter->macAddressCurrent.bytes, ndev->dev_addr, VOS_MAC_ADDR_SIZE); - pr_info("wlan: Generated HotSpot BSSID " - "%02x:%02x:%02x:%02x:%02x:%02x\n", - ndev->dev_addr[0], - ndev->dev_addr[1], - ndev->dev_addr[2], - ndev->dev_addr[3], - ndev->dev_addr[4], - ndev->dev_addr[5]); + pr_info("wlan: Generated HotSpot BSSID " MAC_ADDRESS_STR"\n", + MAC_ADDR_ARRAY(ndev->dev_addr)); } hdd_set_ap_ops( pAdapter->dev ); @@ -4680,9 +4674,7 @@ void hddPrintMacAddr(tCsrBssid macAddr, tANI_U8 logLevel) { VOS_TRACE(VOS_MODULE_ID_HDD, logLevel, - "%02X:%02X:%02X:%02X:%02X:%02X\n", - macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4], - macAddr[5]); + MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr)); } /****** end hddPrintMacAddr() ******/ void @@ -5032,10 +5024,9 @@ v_BOOL_t hdd_isScanAllowed( hdd_context_t *pHddCtx ) { staMac = (v_U8_t *) &(pAdapter->macAddressCurrent.bytes[0]); hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: client %02x:%02x:%02x:%02x:%02x:%02x is in the " - "middle of WPS/EAPOL exchange.", __func__, - staMac[0], staMac[1], staMac[2], - staMac[3], staMac[4], staMac[5]); + "%s: client " MAC_ADDRESS_STR + " is in the middle of WPS/EAPOL exchange.", __func__, + MAC_ADDR_ARRAY(staMac)); return VOS_FALSE; } } @@ -5050,10 +5041,9 @@ v_BOOL_t hdd_isScanAllowed( hdd_context_t *pHddCtx ) staMac = (v_U8_t *) &(pAdapter->aStaInfo[staId].macAddrSTA.bytes[0]); hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: client %02x:%02x:%02x:%02x:%02x:%02x of SoftAP/P2P-GO is in the " - "middle of WPS/EAPOL exchange.", __func__, - staMac[0], staMac[1], staMac[2], - staMac[3], staMac[4], staMac[5]); + "%s: client " MAC_ADDRESS_STR " of SoftAP/P2P-GO is in the " + "middle of WPS/EAPOL exchange.", __func__, + MAC_ADDR_ARRAY(staMac)); return VOS_FALSE; } } @@ -7884,11 +7874,9 @@ static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, { u8 *macAddr = pAdapter->aStaInfo[i].macAddrSTA.bytes; hddLog(VOS_TRACE_LEVEL_INFO, - "%s: Delete STA with MAC::" - "%02x:%02x:%02x:%02x:%02x:%02x", - __func__, - macAddr[0], macAddr[1], macAddr[2], - macAddr[3], macAddr[4], macAddr[5]); + "%s: Delete STA with MAC::" + MAC_ADDRESS_STR, + __func__, MAC_ADDR_ARRAY(macAddr)); vos_status = hdd_softap_sta_deauth(pAdapter, macAddr); if (VOS_IS_STATUS_SUCCESS(vos_status)) pAdapter->aStaInfo[i].isDeauthInProgress = TRUE; @@ -7902,22 +7890,18 @@ static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if (!VOS_IS_STATUS_SUCCESS(vos_status)) { hddLog(VOS_TRACE_LEVEL_INFO, - "%s: Skip this DEL STA as this is not used::" - "%02x:%02x:%02x:%02x:%02x:%02x", - __func__, - mac[0], mac[1], mac[2], - mac[3], mac[4], mac[5]); + "%s: Skip this DEL STA as this is not used::" + MAC_ADDRESS_STR, + __func__, MAC_ADDR_ARRAY(mac)); return -ENOENT; } if( pAdapter->aStaInfo[staId].isDeauthInProgress == TRUE) { hddLog(VOS_TRACE_LEVEL_INFO, - "%s: Skip this DEL STA as deauth is in progress::" - "%02x:%02x:%02x:%02x:%02x:%02x", - __func__, - mac[0], mac[1], mac[2], - mac[3], mac[4], mac[5]); + "%s: Skip this DEL STA as deauth is in progress::" + MAC_ADDRESS_STR, + __func__, MAC_ADDR_ARRAY(mac)); return -ENOENT; } @@ -7925,10 +7909,9 @@ static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, hddLog(VOS_TRACE_LEVEL_INFO, "%s: Delete STA with MAC::" - "%02x:%02x:%02x:%02x:%02x:%02x", + MAC_ADDRESS_STR, __func__, - mac[0], mac[1], mac[2], - mac[3], mac[4], mac[5]); + MAC_ADDR_ARRAY(mac)); vos_status = hdd_softap_sta_deauth(pAdapter, mac); if (!VOS_IS_STATUS_SUCCESS(vos_status)) @@ -7936,10 +7919,9 @@ static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, pAdapter->aStaInfo[staId].isDeauthInProgress = FALSE; hddLog(VOS_TRACE_LEVEL_INFO, "%s: STA removal failed for ::" - "%02x:%02x:%02x:%02x:%02x:%02x", + MAC_ADDRESS_STR, __func__, - mac[0], mac[1], mac[2], - mac[3], mac[4], mac[5]); + MAC_ADDR_ARRAY(mac)); return -ENOENT; } @@ -9174,8 +9156,9 @@ static int wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *d int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, struct net_device *dev, u8 *peer) { - hddLog(VOS_TRACE_LEVEL_INFO, "tdls send discover req: %x %x %x %x %x %x", - peer[0], peer[1], peer[2], peer[3], peer[4], peer[5]); + hddLog(VOS_TRACE_LEVEL_INFO, + "tdls send discover req: "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(peer)); return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, NULL, 0); diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c index 724e6f960625..f4025f3e3f37 100644 --- a/CORE/HDD/src/wlan_hdd_ftm.c +++ b/CORE/HDD/src/wlan_hdd_ftm.c @@ -4399,7 +4399,8 @@ static VOS_STATUS wlan_ftm_priv_set_mac_address(hdd_adapter_t *pAdapter,char *bu return VOS_STATUS_E_FAILURE; } - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "MacAddress = %02x:%02x:%02x:%02x:%02x:%02x",MAC_ADDR_ARRAY(macAddr)); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, + "MacAddress = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr)); pMacAddress = &pMsgBody->SetNvField.fieldData.macAddr.macAddr1[0]; @@ -4408,7 +4409,8 @@ static VOS_STATUS wlan_ftm_priv_set_mac_address(hdd_adapter_t *pAdapter,char *bu pMacAddress[ii] = (v_U8_t)macAddr[ii]; - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "pMacAddress = %02x:%02x:%02x:%02x:%02x:%02x",MAC_ADDR_ARRAY(pMacAddress)); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, + "pMacAddress = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMacAddress)); status = wlan_ftm_postmsg((v_U8_t*)pMsgBuf,pMsgBuf->msgBodyLength); if (status != VOS_STATUS_SUCCESS) diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index 3518e8f62882..409c79ae704a 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -1695,9 +1695,8 @@ int iw_softap_modify_acl(struct net_device *dev, struct iw_request_info *info, i++; cmd = (int)(*(value+i)); - hddLog(LOG1, "%s: SAP Modify ACL arg0 %02x:%02x:%02x:%02x:%02x:%02x arg1 %d arg2 %d\n", - __func__, pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], - pPeerStaMac[3], pPeerStaMac[4], pPeerStaMac[5], listType, cmd); + hddLog(LOG1, "%s: SAP Modify ACL arg0 " MAC_ADDRESS_STR " arg1 %d arg2 %d", + __func__, MAC_ADDR_ARRAY(pPeerStaMac), listType, cmd); if (WLANSAP_ModifyACL(pVosContext, pPeerStaMac,(eSapACLType)listType,(eSapACLCmdType)cmd) != VOS_STATUS_SUCCESS) @@ -1956,9 +1955,8 @@ static iw_softap_disassoc_sta(struct net_device *dev, */ peerMacAddr = (v_U8_t *)(extra); - hddLog(LOG1, "data %02x:%02x:%02x:%02x:%02x:%02x", - peerMacAddr[0], peerMacAddr[1], peerMacAddr[2], - peerMacAddr[3], peerMacAddr[4], peerMacAddr[5]); + hddLog(LOG1, "%s data " MAC_ADDRESS_STR, + __func__, MAC_ADDR_ARRAY(peerMacAddr)); hdd_softap_sta_disassoc(pHostapdAdapter, peerMacAddr); EXIT(); return 0; diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 7beee7f9d478..6421db20a0f3 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -10824,9 +10824,9 @@ void hdd_ch_avoid_cb break; start_channel = hdd_freq_to_chn( - ch_avoid_indi->avoid_freq_range[range_loop].start_freq + 10); + ch_avoid_indi->avoid_freq_range[range_loop].start_freq); end_channel = hdd_freq_to_chn( - ch_avoid_indi->avoid_freq_range[range_loop].end_freq - 10); + ch_avoid_indi->avoid_freq_range[range_loop].end_freq); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s : start %d : %d, end %d : %d", __func__, diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c index a4f83c1dc7e1..06c57d071324 100644 --- a/CORE/HDD/src/wlan_hdd_p2p.c +++ b/CORE/HDD/src/wlan_hdd_p2p.c @@ -701,10 +701,9 @@ int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, memcpy(&dstMac, &buf[WLAN_HDD_80211_FRM_DA_OFFSET], ETH_ALEN); hddLog(VOS_TRACE_LEVEL_INFO, "%s: Deauth/Disassoc received for STA:" - "%02x:%02x:%02x:%02x:%02x:%02x", + MAC_ADDRESS_STR, __func__, - dstMac[0], dstMac[1], dstMac[2], - dstMac[3], dstMac[4], dstMac[5]); + MAC_ADDR_ARRAY(dstMac)); goto err_rem_channel; } } diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c index 64b17fa2e65b..b61c2f610772 100644 --- a/CORE/HDD/src/wlan_hdd_scan.c +++ b/CORE/HDD/src/wlan_hdd_scan.c @@ -215,13 +215,8 @@ static eHalStatus hdd_IndicateScanResult(hdd_scan_info_t *scanInfo, tCsrScanResu char custom[MAX_CUSTOM_LEN]; char *p; - hddLog( LOG1, "hdd_IndicateScanResult %02x:%02x:%02x:%02x:%02x:%02x", - descriptor->bssId[0], - descriptor->bssId[1], - descriptor->bssId[2], - descriptor->bssId[3], - descriptor->bssId[4], - descriptor->bssId[5]); + hddLog( LOG1, "hdd_IndicateScanResult " MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(descriptor->bssId)); error = 0; last_event = current_event; diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c index f356a52d13c5..5b2952b80d3e 100644 --- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c +++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c @@ -1769,29 +1769,14 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, "register station \n"); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, - "station mac %02x:%02x:%02x:%02x:%02x:%02x", - staDesc.vSTAMACAddress.bytes[0], - staDesc.vSTAMACAddress.bytes[1], - staDesc.vSTAMACAddress.bytes[2], - staDesc.vSTAMACAddress.bytes[3], - staDesc.vSTAMACAddress.bytes[4], - staDesc.vSTAMACAddress.bytes[5]); + "station mac " MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(staDesc.vSTAMACAddress.bytes)); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, - "BSSIDforIBSS %02x:%02x:%02x:%02x:%02x:%02x", - staDesc.vBSSIDforIBSS.bytes[0], - staDesc.vBSSIDforIBSS.bytes[1], - staDesc.vBSSIDforIBSS.bytes[2], - staDesc.vBSSIDforIBSS.bytes[3], - staDesc.vBSSIDforIBSS.bytes[4], - staDesc.vBSSIDforIBSS.bytes[5]); + "BSSIDforIBSS " MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(staDesc.vBSSIDforIBSS.bytes)); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, - "SOFTAP SELFMAC %02x:%02x:%02x:%02x:%02x:%02x", - staDesc.vSelfMACAddress.bytes[0], - staDesc.vSelfMACAddress.bytes[1], - staDesc.vSelfMACAddress.bytes[2], - staDesc.vSelfMACAddress.bytes[3], - staDesc.vSelfMACAddress.bytes[4], - staDesc.vSelfMACAddress.bytes[5]); + "SOFTAP SELFMAC " MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(staDesc.vSelfMACAddress.bytes)); vosStatus = hdd_softap_init_tx_rx_sta(pAdapter, staId, &staDesc.vSTAMACAddress); diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index 275ed7c67ac8..7edc56982efc 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 31 +#define QWLAN_VERSION_BUILD 32 -#define QWLAN_VERSIONSTR "1.0.0.31" +#define QWLAN_VERSIONSTR "1.0.0.32" #ifdef QCA_WIFI_2_0 diff --git a/CORE/MAC/src/cfg/polFile.h b/CORE/MAC/src/cfg/polFile.h index e18e49346e90..6378918e0cd9 100644 --- a/CORE/MAC/src/cfg/polFile.h +++ b/CORE/MAC/src/cfg/polFile.h @@ -123,8 +123,8 @@ typedef struct sPolFileHeader { tPolFileVersion FileVersion; tPolFileVersion HWCapabilities; - unsigned long FileLength; - unsigned long NumDirectoryEntries; + unsigned int FileLength; + unsigned int NumDirectoryEntries; } tPolFileHeader; @@ -143,9 +143,9 @@ typedef enum ePolFileDirTypes { typedef struct sPolFileDirEntry { - unsigned long DirEntryType; - unsigned long DirEntryFileOffset; - unsigned long DirEntryLength; + unsigned int DirEntryType; + unsigned int DirEntryFileOffset; + unsigned int DirEntryLength; } tPolFileDirEntry; diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c index f91d62dca75c..803f717758c6 100644 --- a/CORE/MAC/src/pe/lim/limAssocUtils.c +++ b/CORE/MAC/src/pe/lim/limAssocUtils.c @@ -3748,15 +3748,9 @@ tSirRetStatus limStaSendAddBss( tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, &pAddBssParams->staContext.assocId, &psessionEntry->dph.dphHashTable); if (pStaDs == NULL) { - PELOGE(limLog(pMac, LOGE, FL("Couldn't get assoc id for" - "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x"), - pAddBssParams->staContext.staMac[0], - pAddBssParams->staContext.staMac[1], - pAddBssParams->staContext.staMac[2], - pAddBssParams->staContext.staMac[3], - pAddBssParams->staContext.staMac[4], - pAddBssParams->staContext.staMac[5] - );) + PELOGE(limLog(pMac, LOGE, FL("Couldn't get assoc id for " + "MAC ADDR: " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pAddBssParams->staContext.staMac));) } if(!pMac->psOffloadEnabled) diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c index 47f1577c5ee7..39aef28670aa 100644 --- a/CORE/MAC/src/pe/lim/limFT.c +++ b/CORE/MAC/src/pe/lim/limFT.c @@ -873,13 +873,8 @@ tSirRetStatus limFTFillRICBlockAckInfo(tpAniSirGlobal pMac, tANI_U8 *ric_ies, tA if( NULL == pSta ) { PELOGE(limLog( pMac, LOGE, - FL( "STA context not found for saved session's BSSID %02x:%02x:%02x:%02x:%02x:%02x" ), - pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[0], - pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[1], - pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[2], - pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[3], - pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[4], - pMac->ft.ftPEContext.pFTPreAuthReq->currbssId[5] );) + FL( "STA context not found for saved session's BSSID " MAC_ADDRESS_STR ), + MAC_ADDR_ARRAY(pMac->ft.ftPEContext.pFTPreAuthReq->currbssId));) return eSIR_FAILURE; } @@ -1296,10 +1291,7 @@ tANI_BOOLEAN limProcessFTUpdateKey(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf ) pAddBssParams->extSetStaKeyParam.staIdx = 0; PELOG1(limLog(pMac, LOG1, - FL("BSSID = %02X-%02X-%02X-%02X-%02X-%02X"), - pKeyInfo->bssId[0], pKeyInfo->bssId[1], - pKeyInfo->bssId[2], pKeyInfo->bssId[3], - pKeyInfo->bssId[4], pKeyInfo->bssId[5]);) + FL("BSSID = "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pKeyInfo->bssId));) if(pAddBssParams->extSetStaKeyParam.key[0].keyLength == 16) { diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c index 11349d041da5..9f8622590418 100644 --- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c @@ -560,15 +560,10 @@ limProcessAuthFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tpPESession pse (tANI_U8 *) &pMlmDisassocReq->peerMacAddr, sizeof(tSirMacAddr)))) { - PELOGE(limLog(pMac, LOGE, FL("\nTODO:Ack for disassoc " - "frame is pending Issue delsta for" - " %02x:%02x:%02x:%02x:%02x:%02x"), - pMlmDisassocReq->peerMacAddr[0], - pMlmDisassocReq->peerMacAddr[1], - pMlmDisassocReq->peerMacAddr[2], - pMlmDisassocReq->peerMacAddr[3], - pMlmDisassocReq->peerMacAddr[4], - pMlmDisassocReq->peerMacAddr[5]);) + PELOGE(limLog(pMac, LOGE, FL("TODO:Ack for disassoc " + "frame is pending Issue delsta for " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pMlmDisassocReq->peerMacAddr));) limProcessDisassocAckTimeout(pMac); } pMlmDeauthReq = pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; @@ -577,16 +572,10 @@ limProcessAuthFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo, tpPESession pse (tANI_U8 *) &pMlmDeauthReq->peerMacAddr, sizeof(tSirMacAddr)))) { - PELOGE(limLog(pMac, LOGE, FL("\nTODO:Ack for deauth frame " + PELOGE(limLog(pMac, LOGE, FL("TODO:Ack for deauth frame " "is pending Issue delsta for " - "%02x:%02x:%02x:%02x:%02x:%02x"), - pMlmDeauthReq->peerMacAddr[0], - pMlmDeauthReq->peerMacAddr[1], - pMlmDeauthReq->peerMacAddr[2], - pMlmDeauthReq->peerMacAddr[3], - pMlmDeauthReq->peerMacAddr[4], - pMlmDeauthReq->peerMacAddr[5] - );) + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pMlmDeauthReq->peerMacAddr));) limProcessDeauthAckTimeout(pMac); } } diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c index 06705d251599..a0b7a694323b 100644 --- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c +++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c @@ -1481,13 +1481,9 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) vos_mem_copy(&psessionEntry->p2pGoPsUpdate, limMsg->bodyptr, sizeof(tSirP2PNoaAttr)); - limLog(pMac, LOG2, FL(" &psessionEntry->bssId%02x:%02x:%02x:%02x:%02x:%02x ctWin=%d oppPsFlag=%d"), - psessionEntry->bssId[0], - psessionEntry->bssId[1], - psessionEntry->bssId[2], - psessionEntry->bssId[3], - psessionEntry->bssId[4], - psessionEntry->bssId[5], + limLog(pMac, LOG2, FL(" &psessionEntry->bssId " + MAC_ADDRESS_STR " ctWin=%d oppPsFlag=%d"), + MAC_ADDR_ARRAY(psessionEntry->bssId), psessionEntry->p2pGoPsUpdate.ctWin, psessionEntry->p2pGoPsUpdate.oppPsFlag); @@ -1836,15 +1832,8 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("TDLS setup rsp timer expires ")) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("TDLS setup rsp timer expires for peer:")) ; - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("%02X, %02X, %02X,%02X, %02X, %02X"), - peerMac[0], - peerMac[1], - peerMac[2], - peerMac[3], - peerMac[4], - peerMac[5]); + ("TDLS setup rsp timer expires for peer:" + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac)); limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ; if(NULL != setupPeer) @@ -1864,15 +1853,8 @@ limProcessMessages(tpAniSirGlobal pMac, tpSirMsgQ limMsg) VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, ("TDLS setup CNF timer expires ")) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("TDLS setup CNF timer expires for peer:")) ; - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("%02X, %02X, %02X,%02X, %02X, %02X"), - peerMac[0], - peerMac[1], - peerMac[2], - peerMac[3], - peerMac[4], - peerMac[5]); + ("TDLS setup CNF timer expires for peer: " + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac)); limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ; if(NULL != setupPeer) { diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c index d47c4a930761..dda44b5bb513 100644 --- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c @@ -4385,9 +4385,8 @@ limProcessAssocFailureTimeout(tpAniSirGlobal pMac, tANI_U32 MsgType) //To remove the preauth node in case of fail to associate if (limSearchPreAuthList(pMac, psessionEntry->bssId)) { - PELOG1(limLog(pMac, LOG1, FL(" delete pre auth node for %02X-%02X-%02X-%02X-%02X-%02X"), - psessionEntry->bssId[0], psessionEntry->bssId[1], psessionEntry->bssId[2], - psessionEntry->bssId[3], psessionEntry->bssId[4], psessionEntry->bssId[5]);) + PELOG1(limLog(pMac, LOG1, FL(" delete pre auth node for " + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(psessionEntry->bssId));) limDeletePreAuthNode(pMac, psessionEntry->bssId); } diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index df7d9cc4d089..05054620396d 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -1994,14 +1994,9 @@ __limProcessSmeJoinReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) psessionEntry->ssId.ssId[3], psessionEntry->ssId.ssId[4], psessionEntry->ssId.ssId[5]); - limLog(pMac, LOG1, FL("Channel %d, BSSID %x:%x:%x:%x:%x:%x"), + limLog(pMac, LOG1, FL("Channel %d, BSSID "MAC_ADDRESS_STR), psessionEntry->currentOperChannel, - psessionEntry->bssId[0], - psessionEntry->bssId[1], - psessionEntry->bssId[2], - psessionEntry->bssId[3], - psessionEntry->bssId[4], - psessionEntry->bssId[5]);) + MAC_ADDR_ARRAY(psessionEntry->bssId));) /* Indicate whether spectrum management is enabled*/ psessionEntry->spectrumMgtEnabled = @@ -3360,13 +3355,8 @@ void limProcessSmeGetAssocSTAsInfo(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) pAssocStasTemp->Support40Mhz = pStaDs->htDsssCckRate40MHzSupport; limLog(pMac, LOG1, FL("dph Station Number = %d"), staCount+1); - limLog(pMac, LOG1, FL("MAC = %02x:%02x:%02x:%02x:%02x:%02x"), - pStaDs->staAddr[0], - pStaDs->staAddr[1], - pStaDs->staAddr[2], - pStaDs->staAddr[3], - pStaDs->staAddr[4], - pStaDs->staAddr[5]); + limLog(pMac, LOG1, FL("MAC = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pStaDs->staAddr)); limLog(pMac, LOG1, FL("Association Id = %d"),pStaDs->assocId); limLog(pMac, LOG1, FL("Station Index = %d"),pStaDs->staIndex); @@ -4023,9 +4013,9 @@ __limProcessSmeDeltsReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) return; } - PELOG1(limLog(pMac, LOG1, FL("Sent DELTS request to station with assocId = %d MacAddr = %x:%x:%x:%x:%x:%x"), - pDeltsReq->aid, peerMacAddr[0], peerMacAddr[1], peerMacAddr[2], - peerMacAddr[3], peerMacAddr[4], peerMacAddr[5]);) + PELOG1(limLog(pMac, LOG1, FL("Sent DELTS request to station with " + "assocId = %d MacAddr = "MAC_ADDRESS_STR), + pDeltsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));) limSendDeltsReqActionFrame(pMac, peerMacAddr, pDeltsReq->req.wmeTspecPresent, &pDeltsReq->req.tsinfo, &pDeltsReq->req.tspec, psessionEntry); @@ -5352,13 +5342,7 @@ eHalStatus limProcessSmeTeardownReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) } VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - "Teardown for peer = %02x,%02x,%02x,%02x,%02x,%02x", - teardownReq->peerMac[0], - teardownReq->peerMac[1], - teardownReq->peerMac[2], - teardownReq->peerMac[3], - teardownReq->peerMac[4], - teardownReq->peerMac[5]) ; + "Teardown for peer = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(teardownReq->peerMac)); /* * Now, go ahead and transmit TDLS teardown request, and save teardown info * info for future reference. diff --git a/CORE/MAC/src/pe/lim/limProcessTdls.c b/CORE/MAC/src/pe/lim/limProcessTdls.c index 17add923e395..ba810514221a 100644 --- a/CORE/MAC/src/pe/lim/limProcessTdls.c +++ b/CORE/MAC/src/pe/lim/limProcessTdls.c @@ -592,13 +592,8 @@ tSirRetStatus limSendTdlsDisReqFrame(tpAniSirGlobal pMac, tSirMacAddr peer_mac, tdlsDisReq.LinkIdentifier.bssid[4] = 0xde; tdlsDisReq.LinkIdentifier.bssid[5] = 0xad; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Req"), - tdlsDisReq.LinkIdentifier.bssid[0], - tdlsDisReq.LinkIdentifier.bssid[1], - tdlsDisReq.LinkIdentifier.bssid[2], - tdlsDisReq.LinkIdentifier.bssid[3], - tdlsDisReq.LinkIdentifier.bssid[4], - tdlsDisReq.LinkIdentifier.bssid[5]); + ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Discovery Req"), + MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid)); } #endif status = dot11fPackTDLSDisReq( pMac, &tdlsDisReq, pFrame @@ -713,13 +708,8 @@ eHalStatus limTdlsDisRspTxComplete(tpAniSirGlobal pMac, else { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("DisRspTxComplete: staDs not found for %02x:%02x:%02x:%02x:%02x:%02x"), - (peerInfo)->peerMac[0], - (peerInfo)->peerMac[1], - (peerInfo)->peerMac[2], - (peerInfo)->peerMac[3], - (peerInfo)->peerMac[4], - (peerInfo)->peerMac[5]) ; + ("DisRspTxComplete: staDs not found for " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY((peerInfo)->peerMac)); VOS_ASSERT(0) ; return eHAL_STATUS_FAILURE; } @@ -783,13 +773,8 @@ eHalStatus limTdlsSetupCnfTxComplete(tpAniSirGlobal pMac, else { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("RSP-->SME peer MAC = %02x,%02x,%02x,%02x,%02x,%02x"), - (peerInfo)->peerMac[0], - (peerInfo)->peerMac[1], - (peerInfo)->peerMac[2], - (peerInfo)->peerMac[3], - (peerInfo)->peerMac[4], - (peerInfo)->peerMac[5]) ; + ("RSP-->SME peer MAC = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY((peerInfo)->peerMac)); limSendSmeTdlsLinkStartRsp(pMac, eSIR_SUCCESS, (peerInfo)->peerMac, eWNI_SME_TDLS_LINK_START_RSP) ; @@ -833,13 +818,8 @@ eHalStatus limTdlsTeardownTxComplete(tpAniSirGlobal pMac, } VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("teardown peer Mac = %02x,%02x,%02x,%02x,%02x,%02x"), - (peerInfo)->peerMac[0], - (peerInfo)->peerMac[1], - (peerInfo)->peerMac[2], - (peerInfo)->peerMac[3], - (peerInfo)->peerMac[4], - (peerInfo)->peerMac[5]); + ("teardown peer Mac = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY((peerInfo)->peerMac)); //pMac->hal.pCBackFnTxComp = NULL ; @@ -1128,13 +1108,8 @@ static tSirRetStatus limSendTdlsDisRspFrame(tpAniSirGlobal pMac, tdlsDisRsp.LinkIdentifier.bssid[4] = 0xde; tdlsDisRsp.LinkIdentifier.bssid[5] = 0xad; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Discovery Rsp"), - tdlsDisRsp.LinkIdentifier.bssid[0], - tdlsDisRsp.LinkIdentifier.bssid[1], - tdlsDisRsp.LinkIdentifier.bssid[2], - tdlsDisRsp.LinkIdentifier.bssid[3], - tdlsDisRsp.LinkIdentifier.bssid[4], - tdlsDisRsp.LinkIdentifier.bssid[5]); + ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Discovery Rsp"), + MAC_ADDR_ARRAY(tdlsDisRsp.LinkIdentifier.bssid)); } #endif status = dot11fPackTDLSDisRsp( pMac, &tdlsDisRsp, pFrame + @@ -1413,13 +1388,8 @@ tSirRetStatus limSendTdlsLinkSetupReqFrame(tpAniSirGlobal pMac, tdlsSetupReq.LinkIdentifier.bssid[4] = 0xde; tdlsSetupReq.LinkIdentifier.bssid[5] = 0xad; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Req"), - tdlsSetupReq.LinkIdentifier.bssid[0], - tdlsSetupReq.LinkIdentifier.bssid[1], - tdlsSetupReq.LinkIdentifier.bssid[2], - tdlsSetupReq.LinkIdentifier.bssid[3], - tdlsSetupReq.LinkIdentifier.bssid[4], - tdlsSetupReq.LinkIdentifier.bssid[5]); + ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Setup Req"), + MAC_ADDR_ARRAY(tdlsSetupReq.LinkIdentifier.bssid)); } #endif limLog( pMac, LOGW, FL("%s: SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"), @@ -1846,13 +1816,8 @@ static tSirRetStatus limSendTdlsSetupRspFrame(tpAniSirGlobal pMac, tdlsSetupRsp.LinkIdentifier.bssid[4] = 0xde; tdlsSetupRsp.LinkIdentifier.bssid[5] = 0xad; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("TDLS negative running: wrong BSSID %02x:%02x:%02x:%02x:%02x:%02x in TDLS Setup Rsp"), - tdlsSetupRsp.LinkIdentifier.bssid[0], - tdlsSetupRsp.LinkIdentifier.bssid[1], - tdlsSetupRsp.LinkIdentifier.bssid[2], - tdlsSetupRsp.LinkIdentifier.bssid[3], - tdlsSetupRsp.LinkIdentifier.bssid[4], - tdlsSetupRsp.LinkIdentifier.bssid[5]); + ("TDLS negative running: wrong BSSID " MAC_ADDRESS_STR " in TDLS Setup Rsp"), + MAC_ADDR_ARRAY(tdlsSetupRsp.LinkIdentifier.bssid)); } #endif limLog( pMac, LOGW, FL("%s: SupportedChnlWidth %x rxMCSMap %x rxMCSMap %x txSupDataRate %x"), @@ -2891,13 +2856,8 @@ tSirTdlsPeerInfo *limTdlsFindDisPeer(tpAniSirGlobal pMac, tSirMacAddr peerMac) { peerInfo = &discoveryList->tdlsDisPeerInfo ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Peer in discovery list = %02x, %02x, %02x, %02x, %02x, %02x "), - peerInfo->peerMac[0], - peerInfo->peerMac[1], - peerInfo->peerMac[2], - peerInfo->peerMac[3], - peerInfo->peerMac[4], - peerInfo->peerMac[5]) ; + ("Peer in discovery list = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerInfo->peerMac)); if (vos_mem_compare((tANI_U8 *) peerMac, (tANI_U8 *) &peerInfo->peerMac, sizeof(tSirMacAddr)) ) @@ -2925,13 +2885,8 @@ static tSirTdlsPeerInfo *limTdlsFindDisPeerByState(tpAniSirGlobal pMac, { peerInfo = &discoveryList->tdlsDisPeerInfo ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("peerInfo Mac = %02x, %02x, %02x, %02x, %02x, %02x "), - peerInfo->peerMac[0], - peerInfo->peerMac[1], - peerInfo->peerMac[2], - peerInfo->peerMac[3], - peerInfo->peerMac[4], - peerInfo->peerMac[5]) ; + ("peerInfo Mac = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerInfo->peerMac)); if (peerInfo->tdlsPeerState == state) { @@ -2991,13 +2946,8 @@ void limTdlsDelLinkPeer(tpAniSirGlobal pMac, tSirMacAddr peerMac) sizeof(tSirMacAddr)) ) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Del Node for Peer = %02x,%02x,%02x,%02x,%02x,%02x"), - currentNode->peerMac[0], - currentNode->peerMac[1], - currentNode->peerMac[2], - currentNode->peerMac[3], - currentNode->peerMac[4], - currentNode->peerMac[5]) ; + ("Del Node for Peer = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(currentNode->peerMac)); /* if it's first Node */ if(NULL == prevNode) { @@ -3063,13 +3013,8 @@ static tSirRetStatus limProcessTdlsDisReqFrame(tpAniSirGlobal pMac, if(NULL == psessionEntry) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), - tdlsDisReq.LinkIdentifier.bssid[0], - tdlsDisReq.LinkIdentifier.bssid[1], - tdlsDisReq.LinkIdentifier.bssid[2], - tdlsDisReq.LinkIdentifier.bssid[3], - tdlsDisReq.LinkIdentifier.bssid[4], - tdlsDisReq.LinkIdentifier.bssid[5]) ; + ("no Session entry for TDLS session (bssid "MAC_ADDR_ARRAY")"), + MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid)); //VOS_ASSERT(0) ; return eSIR_FAILURE; @@ -3079,23 +3024,12 @@ static tSirRetStatus limProcessTdlsDisReqFrame(tpAniSirGlobal pMac, status = vos_mem_compare( &psessionEntry->bssId[0], &tdlsDisReq.LinkIdentifier.bssid[0], sizeof(tSirMacAddr)) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("lim BSSID %02x, %02x, %02x, %02x, %02x, %02x"), - psessionEntry->bssId[0], - psessionEntry->bssId[1], - psessionEntry->bssId[2], - psessionEntry->bssId[3], - psessionEntry->bssId[4], - psessionEntry->bssId[5]) ; + ("lim BSSID "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY( psessionEntry->bssId)); VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Dis req from BSSID %02x, %02x, %02x, %02x, %02x, %02x"), - tdlsDisReq.LinkIdentifier.bssid[0], - tdlsDisReq.LinkIdentifier.bssid[1], - tdlsDisReq.LinkIdentifier.bssid[2], - tdlsDisReq.LinkIdentifier.bssid[3], - tdlsDisReq.LinkIdentifier.bssid[4], - tdlsDisReq.LinkIdentifier.bssid[5] - ) ; + ("Dis req from BSSID "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(tdlsDisReq.LinkIdentifier.bssid)); if(!status) { limLog( pMac, LOGE, FL("TDLS discovery request frame from other BSS -> something wrong. Check RXP filter")) ; @@ -3284,13 +3218,9 @@ static tSirRetStatus limProcessTdlsSetupReqFrame(tpAniSirGlobal pMac, if(NULL == psessionEntry) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), - tdlsSetupReq.LinkIdentifier.bssid[0], - tdlsSetupReq.LinkIdentifier.bssid[1], - tdlsSetupReq.LinkIdentifier.bssid[2], - tdlsSetupReq.LinkIdentifier.bssid[3], - tdlsSetupReq.LinkIdentifier.bssid[4], - tdlsSetupReq.LinkIdentifier.bssid[5]) ; + ("no Session entry for TDLS session (bssid " + MAC_ADDRESS_STR")"), + MAC_ADDR_ARRAY(tdlsSetupReq.LinkIdentifier.bssid)); //VOS_ASSERT(0) ; return eSIR_FAILURE ; @@ -3477,13 +3407,8 @@ static tSirRetStatus limProcessTdlsSetupReqFrame(tpAniSirGlobal pMac, sizeof(tSirMacAddr)) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Setup REQ MAC = %02x,%02x, %02x, %02x, %02x, %02x"), - setupPeer->peerMac[0], - setupPeer->peerMac[1], - setupPeer->peerMac[2], - setupPeer->peerMac[3], - setupPeer->peerMac[4], - setupPeer->peerMac[5] ) ; + ("Setup REQ MAC = " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(setupPeer->peerMac)); limTdlsUpdateLinkReqPeerInfo(pMac, setupPeer, &tdlsSetupReq) ; pMac->lim.gLimAddStaTdls = true ; @@ -3527,13 +3452,8 @@ static tSirRetStatus limProcessTdlsSetupReqFrame(tpAniSirGlobal pMac, sizeof(tSirMacAddr)) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Setup REQ MAC = %02x,%02x, %02x, %02x, %02x, %02x"), - setupPeer->peerMac[0], - setupPeer->peerMac[1], - setupPeer->peerMac[2], - setupPeer->peerMac[3], - setupPeer->peerMac[4], - setupPeer->peerMac[5] ) ; + ("Setup REQ MAC = "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(setupPeer->peerMac)); limTdlsUpdateLinkReqPeerInfo(pMac, setupPeer, &tdlsSetupReq) ; limSendTdlsSetupRspFrame(pMac, tdlsSetupReq.LinkIdentifier.InitStaAddr, @@ -3592,13 +3512,9 @@ static tSirRetStatus limProcessTdlsSetupRspFrame(tpAniSirGlobal pMac, if(NULL == psessionEntry) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), - tdlsSetupRsp.LinkIdentifier.bssid[0], - tdlsSetupRsp.LinkIdentifier.bssid[1], - tdlsSetupRsp.LinkIdentifier.bssid[2], - tdlsSetupRsp.LinkIdentifier.bssid[3], - tdlsSetupRsp.LinkIdentifier.bssid[4], - tdlsSetupRsp.LinkIdentifier.bssid[5]) ; + ("no Session entry for TDLS session (bssid " + MAC_ADDRESS_STR")"), + MAC_ADDR_ARRAY(tdlsSetupRsp.LinkIdentifier.bssid)); //VOS_ASSERT(0) ; return eSIR_FAILURE; @@ -3621,13 +3537,7 @@ static tSirRetStatus limProcessTdlsSetupRspFrame(tpAniSirGlobal pMac, sizeof(tSirMacAddr)) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("TDLS setup RSP peer = %02x,%02x,%02x,%02x,%02x,%02x"), - peerMac[0], - peerMac[1], - peerMac[2], - peerMac[3], - peerMac[4], - peerMac[5]) ; + ("TDLS setup RSP peer = "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac)); limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ; if(NULL == setupPeer) @@ -3729,13 +3639,9 @@ static tSirRetStatus limProcessTdlsSetupCnfFrame(tpAniSirGlobal pMac, if(NULL == psessionEntry) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), - tdlsSetupCnf.LinkIdentifier.bssid[0], - tdlsSetupCnf.LinkIdentifier.bssid[1], - tdlsSetupCnf.LinkIdentifier.bssid[2], - tdlsSetupCnf.LinkIdentifier.bssid[3], - tdlsSetupCnf.LinkIdentifier.bssid[4], - tdlsSetupCnf.LinkIdentifier.bssid[5]) ; + ("no Session entry for TDLS session (bssid " + MAC_ADDRESS_STR")"), + MAC_ADDR_ARRAY(tdlsSetupCnf.LinkIdentifier.bssid)); //VOS_ASSERT(0) ; return eSIR_FAILURE; @@ -3755,14 +3661,8 @@ static tSirRetStatus limProcessTdlsSetupCnfFrame(tpAniSirGlobal pMac, } /* TODO, do more validation */ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("setup Cnf peer MAc = %02x,%02x,%02x,%02x,%02x,%02x"), - tdlsSetupCnf.LinkIdentifier.InitStaAddr[0], - tdlsSetupCnf.LinkIdentifier.InitStaAddr[1], - tdlsSetupCnf.LinkIdentifier.InitStaAddr[2], - tdlsSetupCnf.LinkIdentifier.InitStaAddr[3], - tdlsSetupCnf.LinkIdentifier.InitStaAddr[4], - tdlsSetupCnf.LinkIdentifier.InitStaAddr[5] - ) ; + ("setup Cnf peer MAc = "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(tdlsSetupCnf.LinkIdentifier.InitStaAddr)); limTdlsFindLinkPeer(pMac, &tdlsSetupCnf.LinkIdentifier.InitStaAddr[0], @@ -3776,13 +3676,8 @@ static tSirRetStatus limProcessTdlsSetupCnfFrame(tpAniSirGlobal pMac, return eSIR_FAILURE ; } VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("setup CNF peer MAC = %02x,%02x,%02x,%02x,%02x,%02x"), - (setupPeer)->peerMac[0], - (setupPeer)->peerMac[1], - (setupPeer)->peerMac[2], - (setupPeer)->peerMac[3], - (setupPeer)->peerMac[4], - (setupPeer)->peerMac[5]) ; + ("setup CNF peer MAC = "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY((setupPeer)->peerMac)); /*T match dialog token, before proceeding further */ if((setupPeer)->dialog != tdlsSetupCnf.DialogToken.token) { @@ -3967,13 +3862,9 @@ static tSirRetStatus limProcessTdlsTeardownFrame(tpAniSirGlobal pMac, if(NULL == psessionEntry) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("no Seesion entry for TDLS session (bssid %02x:%02x:%02x:%02x:%02x:%02x)"), - tdlsTeardown.LinkIdentifier.bssid[0], - tdlsTeardown.LinkIdentifier.bssid[1], - tdlsTeardown.LinkIdentifier.bssid[2], - tdlsTeardown.LinkIdentifier.bssid[3], - tdlsTeardown.LinkIdentifier.bssid[4], - tdlsTeardown.LinkIdentifier.bssid[5]) ; + ("no Session entry for TDLS session (bssid " + MAC_ADDRESS_STR")"), + MAC_ADDR_ARRAY(tdlsTeardown.LinkIdentifier.bssid)); //VOS_ASSERT(0) ; return eSIR_FAILURE; @@ -4005,13 +3896,8 @@ static tSirRetStatus limProcessTdlsTeardownFrame(tpAniSirGlobal pMac, return eSIR_FAILURE ; } VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("teardown for peer %02x,%02x,%02x,%02x,%02x,%02x"), - (setupPeer)->peerMac[0], - (setupPeer)->peerMac[1], - (setupPeer)->peerMac[2], - (setupPeer)->peerMac[3], - (setupPeer)->peerMac[4], - (setupPeer)->peerMac[5]) ; + ("teardown for peer "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY((setupPeer)->peerMac)); switch(tdlsTeardown.Reason.code) { @@ -4151,13 +4037,8 @@ static tSirRetStatus limTdlsDisAddSta(tpAniSirGlobal pMac, tSirMacAddr peerMac, } VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("ADD STA peer MAC: %02x, %02x, %02x, %02x, %02x, %02x"), - peerMac[0], - peerMac[1], - peerMac[2], - peerMac[3], - peerMac[4], - peerMac[5]) ; + ("ADD STA peer MAC: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerMac)); if(NULL != dphLookupHashEntry(pMac, peerMac, @@ -4242,13 +4123,8 @@ static tSirRetStatus limTdlsDisAddSta(tpAniSirGlobal pMac, tSirMacAddr peerMac, pStaDs->mlmStaContext.capabilityInfo = peerInfo->capabilityInfo; vos_mem_copy( pStaDs->staAddr, peerMac, sizeof(tSirMacAddr)) ; VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Add STA for Peer: %02x, %02x, %02x, %02x, %02x, %02x"), - pStaDs->staAddr[0], - pStaDs->staAddr[1], - pStaDs->staAddr[2], - pStaDs->staAddr[3], - pStaDs->staAddr[4], - pStaDs->staAddr[5]) ; + ("Add STA for Peer: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pStaDs->staAddr)); pStaDs->staType = STA_ENTRY_TDLS_PEER ; @@ -4347,14 +4223,8 @@ static tpDphHashNode limTdlsDelSta(tpAniSirGlobal pMac, tSirMacAddr peerMac, { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("DEL STA peer MAC: %02x, %02x, %02x, %02x, %02x, %02x "), - pStaDs->staAddr[0], - pStaDs->staAddr[1], - pStaDs->staAddr[2], - pStaDs->staAddr[3], - pStaDs->staAddr[4], - pStaDs->staAddr[5] - ) ; + ("DEL STA peer MAC: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pStaDs->staAddr)); VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, ("limTdlsDelSta: STA type = %x, sta idx = %x"),pStaDs->staType, @@ -4398,10 +4268,10 @@ static tSirRetStatus limTdlsLinkEstablish(tpAniSirGlobal pMac, tSirMacAddr peerM limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ; if(NULL == setupPeer) { - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("limTdlsLinkEstablish: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"), - peerMac[0], peerMac[1], peerMac[2], - peerMac[3], peerMac[4], peerMac[5]); + VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, + ("limTdlsLinkEstablish: cannot find peer mac " + "in tdls linksetup list: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerMac)); return eSIR_FAILURE; } @@ -4419,9 +4289,9 @@ static tSirRetStatus limTdlsLinkEstablish(tpAniSirGlobal pMac, tSirMacAddr peerM pStaDs = dphLookupHashEntry(pMac, peerMac, &aid, &psessionEntry->dph.dphHashTable) ; if(pStaDs == NULL) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("limTdlsLinkEstablish: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"), - peerMac[0], peerMac[1], peerMac[2], - peerMac[3], peerMac[4], peerMac[5]); + ("limTdlsLinkEstablish: cannot find peer mac " + "in hash table: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerMac)); return eSIR_FAILURE; } @@ -4526,10 +4396,10 @@ static tSirRetStatus limTdlsLinkTeardown(tpAniSirGlobal pMac, tSirMacAddr peerMa limTdlsFindLinkPeer(pMac, peerMac, &setupPeer) ; if(NULL == setupPeer) { - VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("limTdlsLinkTeardown: cannot find peer mac in tdls linksetup list: %02X %02X %02X %02X %02X %02X"), - peerMac[0], peerMac[1], peerMac[2], - peerMac[3], peerMac[4], peerMac[5]); + VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, + ("limTdlsLinkTeardown: cannot find peer mac " + "in tdls linksetup list: " + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac)); return eSIR_FAILURE; } @@ -4550,9 +4420,9 @@ static tSirRetStatus limTdlsLinkTeardown(tpAniSirGlobal pMac, tSirMacAddr peerMa if(pStaDs == NULL) { VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, - ("limTdlsLinkTeardown: cannot find peer mac in hash table: %02X %02X %02X %02X %02X %02X"), - peerMac[0], peerMac[1], peerMac[2], - peerMac[3], peerMac[4], peerMac[5]); + ("limTdlsLinkTeardown: cannot find peer mac " + "in hash table: " + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peerMac)); return eSIR_FAILURE; } @@ -4602,13 +4472,8 @@ static tSirTdlsDisRsp *tdlsPrepareTdlsDisRsp(tpAniSirGlobal pMac, sizeof(tSirTdlsPeerInfo)); VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO, - ("Msg Sent to PE, peer MAC: %02x, %02x, %02x, %02x, %02x, %02x"), - peerInfo->peerMac[0], - peerInfo->peerMac[1], - peerInfo->peerMac[2], - peerInfo->peerMac[3], - peerInfo->peerMac[4], - peerInfo->peerMac[5]); + ("Msg Sent to PE, peer MAC: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerInfo->peerMac)); disStaCount-- ; peerInfo++ ; currentNode = tdlsDisRspList ; @@ -4981,13 +4846,8 @@ eHalStatus limProcessTdlsAddStaRsp(tpAniSirGlobal pMac, void *msg, SET_LIM_PROCESS_DEFD_MESGS(pMac, true); VOS_TRACE(VOS_MODULE_ID_PE, TDLS_DEBUG_LOG_LEVEL, - ("limTdlsAddStaRsp: staIdx=%d, staMac=%02x:%02x:%02x:%02x:%02x:%02x"), pAddStaParams->staIdx, - pAddStaParams->staMac[0], - pAddStaParams->staMac[1], - pAddStaParams->staMac[2], - pAddStaParams->staMac[3], - pAddStaParams->staMac[4], - pAddStaParams->staMac[5] ) ; + ("limTdlsAddStaRsp: staIdx=%d, staMac="MAC_ADDRESS_STR), pAddStaParams->staIdx, + MAC_ADDR_ARRAY(pAddStaParams->staMac)); if (pAddStaParams->status != eHAL_STATUS_SUCCESS) { @@ -5623,9 +5483,8 @@ tSirRetStatus limDeleteTDLSPeers(tpAniSirGlobal pMac, tpPESession psessionEntry) if (NULL != pStaDs) { - PELOGE(limLog(pMac, LOGE, FL("Deleting %02x:%02x:%02x:%02x:%02x:%02x"), - pStaDs->staAddr[0], pStaDs->staAddr[1], pStaDs->staAddr[2], - pStaDs->staAddr[3], pStaDs->staAddr[4], pStaDs->staAddr[5]);) + PELOGE(limLog(pMac, LOGE, FL("Deleting "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pStaDs->staAddr));); limSendDeauthMgmtFrame(pMac, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON, pStaDs->staAddr, psessionEntry, FALSE); diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c index 072945d0b755..b8e65d746c7e 100644 --- a/CORE/MAC/src/pe/lim/limScanResultUtils.c +++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c @@ -540,27 +540,12 @@ limCheckAndAddBssDescription(tpAniSirGlobal pMac, #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (WDA_GET_OFFLOADSCANLEARN(pRxPacketInfo)) { - limLog(pMac, LOG2, FL(" pHdr->addr1:%02x:%02x:%02x:%02x:%02x:%02x\n"), - pHdr->addr1[0], - pHdr->addr1[1], - pHdr->addr1[2], - pHdr->addr1[3], - pHdr->addr1[4], - pHdr->addr1[5]); - limLog(pMac, LOG2, FL(" pHdr->addr2:%02x:%02x:%02x:%02x:%02x:%02x\n"), - pHdr->addr2[0], - pHdr->addr2[1], - pHdr->addr2[2], - pHdr->addr2[3], - pHdr->addr2[4], - pHdr->addr2[5]); - limLog(pMac, LOG2, FL(" pHdr->addr3:%02x:%02x:%02x:%02x:%02x:%02x\n"), - pHdr->addr3[0], - pHdr->addr3[1], - pHdr->addr3[2], - pHdr->addr3[3], - pHdr->addr3[4], - pHdr->addr3[5]); + limLog(pMac, LOG2, FL(" pHdr->addr1:"MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pHdr->addr1)); + limLog(pMac, LOG2, FL(" pHdr->addr2:"MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pHdr->addr2)); + limLog(pMac, LOG2, FL(" pHdr->addr3:"MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pHdr->addr3)); limLog( pMac, LOG2, FL("Save this entry in LFR cache")); status = limLookupNaddLfrHashEntry(pMac, pBssDescr, LIM_HASH_ADD, dontUpdateAll); } diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c index 2771f3697a21..08a68e62a1db 100644 --- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c +++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c @@ -2908,9 +2908,8 @@ void limSendSmeMaxAssocExceededNtf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, pSmeMaxAssocInd->sessionId = smesessionId; mmhMsg.type = pSmeMaxAssocInd->mesgType; mmhMsg.bodyptr = pSmeMaxAssocInd; - PELOG1(limLog(pMac, LOG1, FL("msgType %s peerMacAddr %02x-%02x-%02x-%02x-%02x-%02x" - "sme session id %d"),"eWNI_SME_MAX_ASSOC_EXCEEDED", peerMacAddr[0], peerMacAddr[1], - peerMacAddr[2], peerMacAddr[3], peerMacAddr[4], peerMacAddr[5], smesessionId);) + PELOG1(limLog(pMac, LOG1, FL("msgType %s peerMacAddr "MAC_ADDRESS_STR + " sme session id %d"), "eWNI_SME_MAX_ASSOC_EXCEEDED", MAC_ADDR_ARRAY(peerMacAddr));) MTRACE(macTraceMsgTx(pMac, smesessionId, mmhMsg.type)); limSysProcessMmhMsgApi(pMac, &mmhMsg, ePROT); diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 0e0b0a04d34d..df1872dc1dc4 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -1251,9 +1251,7 @@ void limPrintMacAddr(tpAniSirGlobal pMac, tSirMacAddr macAddr, tANI_U8 logLevel) { limLog(pMac, logLevel, - FL("%X:%X:%X:%X:%X:%X"), - macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4], - macAddr[5]); + FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(macAddr)); } /****** end limPrintMacAddr() ******/ @@ -5808,9 +5806,9 @@ if((psessionEntry = peFindSessionByBssid(pMac,pDelTsParam->bssId,&sessionId))== PELOGE(limLog(pMac, LOGE, FL("limValidateDeltsReq failed"));) goto error2; } - PELOG1(limLog(pMac, LOG1, "Sent DELTS request to station with assocId = %d MacAddr = %x:%x:%x:%x:%x:%x", - pDelTsReq->aid, peerMacAddr[0], peerMacAddr[1], peerMacAddr[2], - peerMacAddr[3], peerMacAddr[4], peerMacAddr[5]);) + PELOG1(limLog(pMac, LOG1, "Sent DELTS request to station with " + "assocId = %d MacAddr = "MAC_ADDRESS_STR, + pDelTsReq->aid, MAC_ADDR_ARRAY(peerMacAddr));) limSendDeltsReqActionFrame(pMac, peerMacAddr, pDelTsReq->req.wmeTspecPresent, &pDelTsReq->req.tsinfo, &pDelTsReq->req.tspec, psessionEntry); diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c index 2a4f19c50feb..c117d33cac18 100644 --- a/CORE/SAP/src/sapApiLinkCntl.c +++ b/CORE/SAP/src/sapApiLinkCntl.c @@ -476,24 +476,19 @@ WLANSAP_RoamCallback vosStatus = sapSignalHDDevent( sapContext, pCsrRoamInfo, eSAP_STA_ASSOC_IND, (v_PVOID_t)eSAP_STATUS_SUCCESS); if(!VOS_IS_STATUS_SUCCESS(vosStatus)) { - VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, - "In %s, CSR roamResult = (%d) MAC" - "(%02X-%02X-%02X-%02X-%02X-%02X) fail", - __func__, roamResult, pCsrRoamInfo->peerMac[0], - pCsrRoamInfo->peerMac[1], pCsrRoamInfo->peerMac[2], - pCsrRoamInfo->peerMac[3], pCsrRoamInfo->peerMac[4], - pCsrRoamInfo->peerMac[5]); + VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, + "In %s, CSR roamResult = (%d) MAC (" + MAC_ADDRESS_STR") fail", __func__, roamResult, + MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac)); halStatus = eHAL_STATUS_FAILURE; } } else { - VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN, - "In %s, CSR roamResult = (%d) MAC" - "(%02X-%02X-%02X-%02X-%02X-%02X) not allowed", - __func__, roamResult, pCsrRoamInfo->peerMac[0], - pCsrRoamInfo->peerMac[1], pCsrRoamInfo->peerMac[2], - pCsrRoamInfo->peerMac[3], pCsrRoamInfo->peerMac[4], pCsrRoamInfo->peerMac[5]); + VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN, + "In %s, CSR roamResult = (%d) MAC (" + MAC_ADDRESS_STR") not allowed", __func__, roamResult, + MAC_ADDR_ARRAY(pCsrRoamInfo->peerMac)); halStatus = eHAL_STATUS_FAILURE; } diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c index 00e051a2ea60..d00bfb83becc 100644 --- a/CORE/SAP/src/sapFsm.c +++ b/CORE/SAP/src/sapFsm.c @@ -1577,14 +1577,15 @@ sapRemoveMacFromACL(v_MACADDR_t *macList, v_U8_t *size, v_U8_t index) void sapPrintACL(v_MACADDR_t *macList, v_U8_t size) { int i; + v_BYTE_t *macArray; VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH,"print acl entered"); if (size==0) return; for (i=0; i<size; i++) { + macArray = (macList+i)->bytes; VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, - "** ACL entry %i - %02x:%02x:%02x:%02x:%02x:%02x", i, - (macList+i)->bytes[0], (macList+i)->bytes[1], (macList+i)->bytes[2], - (macList+i)->bytes[3], (macList+i)->bytes[4], (macList+i)->bytes[5]); + "** ACL entry %i - "MAC_ADDRESS_STR, i, + MAC_ADDR_ARRAY(macArray)); } return; } @@ -1600,8 +1601,9 @@ sapIsPeerMacAllowed(ptSapContext sapContext, v_U8_t *peerMac) if (sapSearchMacList(sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) { - VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x in deny list", - __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5)); + VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, + "In %s, Peer "MAC_ADDRESS_STR" in deny list", + __func__, MAC_ADDR_ARRAY(peerMac)); return VOS_STATUS_E_FAILURE; } @@ -1612,8 +1614,9 @@ sapIsPeerMacAllowed(ptSapContext sapContext, v_U8_t *peerMac) // A new station CANNOT associate, unless in accept list. More stringent mode if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) { - VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", - __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5)); + VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, + "In %s, Peer "MAC_ADDRESS_STR" denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", + __func__, MAC_ADDR_ARRAY(peerMac)); return VOS_STATUS_E_FAILURE; } @@ -1623,8 +1626,9 @@ sapIsPeerMacAllowed(ptSapContext sapContext, v_U8_t *peerMac) if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode) { sapSignalHDDevent(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (v_PVOID_t)peerMac); - VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, "In %s, Peer %02x:%02x:%02x:%02x:%02x:%02x denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", - __func__, *peerMac, *(peerMac + 1), *(peerMac + 2), *(peerMac + 3), *(peerMac + 4), *(peerMac + 5)); + VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_INFO_HIGH, + "In %s, Peer "MAC_ADDRESS_STR" denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", + __func__, MAC_ADDR_ARRAY(peerMac)); return VOS_STATUS_E_FAILURE; } return VOS_STATUS_SUCCESS; diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c index 0c4289fcd792..ad5f16cb488a 100644 --- a/CORE/SAP/src/sapModule.c +++ b/CORE/SAP/src/sapModule.c @@ -1059,10 +1059,9 @@ WLANSAP_ModifyACL if (staInWhiteList && staInBlackList) { VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, - "Peer mac %02x:%02x:%02x:%02x:%02x:%02x found in white and black lists." + "Peer mac "MAC_ADDRESS_STR" found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + MAC_ADDR_ARRAY(pPeerStaMac)); return VOS_STATUS_E_FAILURE; } @@ -1078,18 +1077,16 @@ WLANSAP_ModifyACL if (pSapCtx->nAcceptMac == MAX_ACL_MAC_ADDRESS) { VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, - "White list is already maxed out. Cannot accept %02x:%02x:%02x:%02x:%02x:%02x", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + "White list is already maxed out. Cannot accept "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pPeerStaMac)); return VOS_STATUS_E_FAILURE; } if (staInWhiteList) { //Do nothing if already present in white list. Just print a warning VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN, - "MAC address already present in white list %02x:%02x:%02x:%02x:%02x:%02x", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + "MAC address already present in white list "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pPeerStaMac)); } else { if (staInBlackList) @@ -1118,9 +1115,8 @@ WLANSAP_ModifyACL else { VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN, - "MAC address to be deleted is not present in the white list %02x:%02x:%02x:%02x:%02x:%02x", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + "MAC address to be deleted is not present in the white list "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pPeerStaMac)); return VOS_STATUS_E_FAILURE; } } @@ -1141,18 +1137,16 @@ WLANSAP_ModifyACL if (pSapCtx->nDenyMac == MAX_ACL_MAC_ADDRESS) { VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, - "Black list is already maxed out. Cannot accept %02x:%02x:%02x:%02x:%02x:%02x", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + "Black list is already maxed out. Cannot accept "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pPeerStaMac)); return VOS_STATUS_E_FAILURE; } if (staInBlackList) { //Do nothing if already present in white list VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN, - "MAC address already present in black list %02x:%02x:%02x:%02x:%02x:%02x", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + "MAC address already present in black list "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pPeerStaMac)); } else { if (staInWhiteList) @@ -1181,9 +1175,8 @@ WLANSAP_ModifyACL else { VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_WARN, - "MAC address to be deleted is not present in the black list %02x:%02x:%02x:%02x:%02x:%02x", - pPeerStaMac[0], pPeerStaMac[1], pPeerStaMac[2], pPeerStaMac[3], - pPeerStaMac[4], pPeerStaMac[5]); + "MAC address to be deleted is not present in the black list "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pPeerStaMac)); return VOS_STATUS_E_FAILURE; } } diff --git a/CORE/SERVICES/COMMON/wdi_in.h b/CORE/SERVICES/COMMON/wdi_in.h index 69ae4d1b68f1..8c266f0114df 100644 --- a/CORE/SERVICES/COMMON/wdi_in.h +++ b/CORE/SERVICES/COMMON/wdi_in.h @@ -1199,19 +1199,12 @@ ol_tx_queue_log_display(ol_txrx_pdev_handle pdev); #define wdi_in_peer_attach ol_txrx_peer_attach #define wdi_in_peer_update ol_txrx_peer_update #define wdi_in_peer_pause ol_txrx_peer_pause -#define wdi_in_peer_pause ol_txrx_peer_pause -#define wdi_in_peer_tid_unpause ol_txrx_peer_tid_unpause #define wdi_in_peer_tid_unpause ol_txrx_peer_tid_unpause #define wdi_in_tx_release ol_txrx_tx_release -#define wdi_in_tx_release ol_txrx_tx_release -#define wdi_in_vdev_pause ol_txrx_vdev_pause #define wdi_in_vdev_pause ol_txrx_vdev_pause #define wdi_in_vdev_unpause ol_txrx_vdev_unpause -#define wdi_in_vdev_unpause ol_txrx_vdev_unpause -#define wdi_in_pdev_pause ol_txrx_pdev_pause #define wdi_in_pdev_pause ol_txrx_pdev_pause #define wdi_in_pdev_unpause ol_txrx_pdev_unpause -#define wdi_in_pdev_unpause ol_txrx_pdev_unpause #define wdi_in_tx_sync ol_txrx_tx_sync #define wdi_in_peer_detach ol_txrx_peer_detach #define wdi_in_vdev_detach ol_txrx_vdev_detach diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c index 90b4ccab0b28..6c7429a294e0 100644 --- a/CORE/SERVICES/HIF/PCIe/if_pci.c +++ b/CORE/SERVICES/HIF/PCIe/if_pci.c @@ -102,13 +102,12 @@ hif_pci_interrupt_handler(int irq, void *arg) { struct hif_pci_softc *sc = (struct hif_pci_softc *) arg; struct HIF_CE_state *hif_state = (struct HIF_CE_state *)sc->hif_device; - A_target_id_t targid = hif_state->targid; volatile int tmp; if (LEGACY_INTERRUPTS(sc)) { if (sc->hif_init_done == TRUE) - A_TARGET_ACCESS_BEGIN(targid); + A_TARGET_ACCESS_BEGIN(hif_state->targid); /* Clear Legacy PCI line interrupts */ /* IMPORTANT: INTR_CLR regiser has to be set after INTR_ENABLE is set to 0, */ @@ -123,7 +122,7 @@ hif_pci_interrupt_handler(int irq, void *arg) VOS_BUG(0); } if (sc->hif_init_done == TRUE) - A_TARGET_ACCESS_END(targid); + A_TARGET_ACCESS_END(hif_state->targid); } /* TBDXXX: Add support for WMAC */ @@ -411,7 +410,6 @@ wlan_tasklet(unsigned long data) { struct hif_pci_softc *sc = (struct hif_pci_softc *) data; struct HIF_CE_state *hif_state = (struct HIF_CE_state *)sc->hif_device; - A_target_id_t targid = hif_state->targid; volatile int tmp; if (sc->hif_init_done == FALSE) { @@ -434,7 +432,7 @@ irq_handled: if (LEGACY_INTERRUPTS(sc)) { if (sc->hif_init_done == TRUE) - A_TARGET_ACCESS_BEGIN(targid); + A_TARGET_ACCESS_BEGIN(hif_state->targid); /* Enable Legacy PCI line interrupts */ A_PCI_WRITE32(sc->mem+(SOC_CORE_BASE_ADDRESS | PCIE_INTR_ENABLE_ADDRESS), @@ -443,7 +441,7 @@ irq_handled: tmp = A_PCI_READ32(sc->mem+(SOC_CORE_BASE_ADDRESS | PCIE_INTR_ENABLE_ADDRESS)); if (sc->hif_init_done == TRUE) - A_TARGET_ACCESS_END(targid); + A_TARGET_ACCESS_END(hif_state->targid); } } diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 765254829b51..3d04929b472e 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -2332,6 +2332,8 @@ VOS_STATUS WDA_open(v_VOID_t *vos_context, v_VOID_t *os_ctx, INIT_LIST_HEAD(&wma_handle->vdev_resp_queue); adf_os_spinlock_init(&wma_handle->vdev_respq_lock); + adf_os_spinlock_init(&wma_handle->vdev_detach_lock); + /* Register vdev start response event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_VDEV_START_RESP_EVENTID, @@ -2716,38 +2718,48 @@ static VOS_STATUS wma_vdev_detach(tp_wma_handle wma_handle, return status; } - /* remove the interface from ath_dev */ - if (wma_unified_vdev_delete_send(wma_handle->wmi_handle, vdev_id)) { - WMA_LOGP("Unable to remove an interface for ath_dev.\n"); - status = VOS_STATUS_E_FAILURE; - goto out; - } - if(!iface->handle) { - status = VOS_STATUS_E_FAILURE; - WMA_LOGP("handle of vdev_id %d is NULL", vdev_id); - goto out; - } + adf_os_spin_lock_bh(&wma_handle->vdev_detach_lock); + if(!iface->handle) { + status = VOS_STATUS_E_FAILURE; + WMA_LOGE("handle of vdev_id %d is NULL vdev is already freed", + vdev_id); + adf_os_spin_unlock_bh(&wma_handle->vdev_detach_lock); + goto out; + } - WMA_LOGA("vdev_id:%hu vdev_hdl:%p\n", vdev_id, iface->handle); - if (!generateRsp) { - WMA_LOGD("Call txrx detach w/o callback for vdev %d", vdev_id); - ol_txrx_vdev_detach(iface->handle, NULL, NULL); - goto out; - } + /* remove the interface from ath_dev */ + if (wma_unified_vdev_delete_send(wma_handle->wmi_handle, vdev_id)) { + WMA_LOGE("Unable to remove an interface for ath_dev.\n"); + status = VOS_STATUS_E_FAILURE; + adf_os_spin_unlock_bh(&wma_handle->vdev_detach_lock); + goto out; + } - iface->del_staself_req = pdel_sta_self_req_param; - msg = wma_fill_vdev_req(wma_handle, vdev_id, WDA_DEL_STA_SELF_REQ, - WMA_TARGET_REQ_TYPE_VDEV_DEL, iface, 2000); - if (!msg) { - WMA_LOGP("%s: Failed to fill vdev request for vdev_id %d\n", - __func__, vdev_id); - status = VOS_STATUS_E_NOMEM; - goto out; - } - WMA_LOGD("Call txrx detach with callback for vdev %d", vdev_id); - ol_txrx_vdev_detach(iface->handle, wma_vdev_detach_callback, iface); - return status; + + WMA_LOGA("vdev_id:%hu vdev_hdl:%p\n", vdev_id, iface->handle); + if (!generateRsp) { + WMA_LOGE("Call txrx detach w/o callback for vdev %d", vdev_id); + ol_txrx_vdev_detach(iface->handle, NULL, NULL); + adf_os_spin_unlock_bh(&wma_handle->vdev_detach_lock); + goto out; + } + + iface->del_staself_req = pdel_sta_self_req_param; + msg = wma_fill_vdev_req(wma_handle, vdev_id, WDA_DEL_STA_SELF_REQ, + WMA_TARGET_REQ_TYPE_VDEV_DEL, iface, 2000); + if (!msg) { + WMA_LOGE("%s: Failed to fill vdev request for vdev_id %d\n", + __func__, vdev_id); + status = VOS_STATUS_E_NOMEM; + adf_os_spin_unlock_bh(&wma_handle->vdev_detach_lock); + goto out; + } + WMA_LOGE("Call txrx detach with callback for vdev %d", vdev_id); + ol_txrx_vdev_detach(iface->handle, NULL, NULL); + wma_vdev_detach_callback(iface); + adf_os_spin_unlock_bh(&wma_handle->vdev_detach_lock); + return status; out: if(iface->addBssStaContext) adf_os_mem_free(iface->addBssStaContext); @@ -3269,10 +3281,7 @@ static ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, self_sta_req->selfMacAddr, self_sta_req->sessionId, txrx_vdev_type); -#ifdef QCA_SUPPORT_TXRX_VDEV_LL_TXQ - WMA_LOGD("LL TX Pause Mutex init"); - adf_os_spinlock_init(&txrx_vdev_handle->ll_pause.mutex); -#endif /* QCA_SUPPORT_TXRX_VDEV_LL_TXQ */ + wma_handle->interfaces[self_sta_req->sessionId].pause_bitmap = 0; WMA_LOGA("vdev_id %hu, txrx_vdev_handle = %p", self_sta_req->sessionId, txrx_vdev_handle); @@ -14890,12 +14899,12 @@ static int wma_mcc_vdev_tx_pause_evt_handler(void *handle, u_int8_t *event, tp_wma_handle wma = (tp_wma_handle) handle; WMI_TX_PAUSE_EVENTID_param_tlvs *param_buf; wmi_tx_pause_event_fixed_param *wmi_event; - ol_txrx_vdev_handle txrx_vdev; u_int8_t vdev_id; A_UINT32 vdev_map; param_buf = (WMI_TX_PAUSE_EVENTID_param_tlvs *) event; - if (!param_buf) { + if (!param_buf) + { WMA_LOGE("Invalid roam event buffer"); return -EINVAL; } @@ -14909,35 +14918,47 @@ static int wma_mcc_vdev_tx_pause_evt_handler(void *handle, u_int8_t *event, { if (!(vdev_map & 0x1)) { - vdev_map >>= 1; + /* No Vdev */ } else { - WMA_LOGI("Found vdev %d", vdev_id); - break; - } - } + if (!wma->interfaces[vdev_id].handle) + { + WMA_LOGE("%s: invalid vdev ID %d", __func__, vdev_id); + /* Test Next VDEV */ + vdev_map >>= 1; + continue; + } - WMA_LOGI("vdev_id %d, vdev_map 0x%x, tid_map 0x%x," - " pause_type 0x%x, action 0x%x, peer_id 0x%x", - vdev_id, wmi_event->vdev_map, wmi_event->tid_map, - wmi_event->pause_type, wmi_event->action, wmi_event->peer_id); + /* PAUSE action, add bitmap */ + if (ACTION_PAUSE == wmi_event->action) + { + wma->interfaces[vdev_id].pause_bitmap |= (1 << wmi_event->pause_type); + wdi_in_vdev_pause(wma->interfaces[vdev_id].handle); + } + /* UNPAUSE action, clean bitmap */ + else if (ACTION_UNPAUSE == wmi_event->action) + { + wma->interfaces[vdev_id].pause_bitmap &= ~(1 << wmi_event->pause_type); + if (!wma->interfaces[vdev_id].pause_bitmap) + { + /* PAUSE BIT MAP is cleared + * UNPAUSE VDEV */ + wdi_in_vdev_unpause(wma->interfaces[vdev_id].handle); + } + } + else + { + WMA_LOGE("Not Valid Action Type %d", wmi_event->action); + } - txrx_vdev = wma->interfaces[vdev_id].handle; - if (txrx_vdev) - { - if ((PAUSE_TYPE_CHOP == wmi_event->pause_type) && - (!wmi_event->action)) - { - wdi_in_vdev_pause(txrx_vdev); - } - if ((PAUSE_TYPE_CHOP == wmi_event->pause_type) && - (wmi_event->action)) - { - wdi_in_vdev_unpause(txrx_vdev); + WMA_LOGD("vdev_id %d, pause_map 0x%x, pause type %d, action %d", + vdev_id, wma->interfaces[vdev_id].pause_bitmap, + wmi_event->pause_type, wmi_event->action); } - /* TODO, other types of pause should be added */ + /* Test Next VDEV */ + vdev_map >>= 1; } return 0; @@ -15361,7 +15382,8 @@ static int wma_channel_avoid_evt_handler(void *handle, u_int8_t *event, WMA_LOGD("Channel avoid event received with %d ranges", num_freq_ranges); for (freq_range_idx = 0; freq_range_idx < num_freq_ranges; freq_range_idx++) { - afr_desc = (wmi_avoid_freq_range_desc *) (param_buf->avd_freq_range + freq_range_idx * sizeof(wmi_avoid_freq_range_desc)); + afr_desc = (wmi_avoid_freq_range_desc *) (param_buf->avd_freq_range + + freq_range_idx * sizeof(wmi_avoid_freq_range_desc)); WMA_LOGD("range %d: tlv id = %u, start freq = %u, end freq = %u", freq_range_idx, afr_desc->tlv_header, @@ -15378,9 +15400,12 @@ static int wma_channel_avoid_evt_handler(void *handle, u_int8_t *event, sca_indication->avoid_range_count = num_freq_ranges; for (freq_range_idx = 0; freq_range_idx < num_freq_ranges; freq_range_idx++) { - afr_desc = (wmi_avoid_freq_range_desc *) (param_buf->avd_freq_range + freq_range_idx * sizeof(wmi_avoid_freq_range_desc)); - sca_indication->avoid_freq_range[freq_range_idx].start_freq = afr_desc->start_freq; - sca_indication->avoid_freq_range[freq_range_idx].end_freq = afr_desc->end_freq; + afr_desc = (wmi_avoid_freq_range_desc *) (param_buf->avd_freq_range + + freq_range_idx * sizeof(wmi_avoid_freq_range_desc)); + sca_indication->avoid_freq_range[freq_range_idx].start_freq = + afr_desc->start_freq + 10; + sca_indication->avoid_freq_range[freq_range_idx].end_freq = afr_desc->end_freq + - 10; } sme_msg.type = eWNI_SME_CH_AVOID_IND; diff --git a/CORE/SERVICES/WMA/wma.h b/CORE/SERVICES/WMA/wma.h index 1ee7d74ddef6..53501bc49003 100644 --- a/CORE/SERVICES/WMA/wma.h +++ b/CORE/SERVICES/WMA/wma.h @@ -430,6 +430,7 @@ struct wma_txrx_node { tANI_U8 rate_flags; tANI_U8 nss; v_BOOL_t is_channel_switch; + u_int16_t pause_bitmap; }; #if defined(QCA_WIFI_FTM) && !defined(QCA_WIFI_ISOC) @@ -520,6 +521,7 @@ typedef struct { u_int32_t peer_count; struct list_head vdev_resp_queue; adf_os_spinlock_t vdev_respq_lock; + adf_os_spinlock_t vdev_detach_lock; u_int32_t ht_cap_info; #ifdef WLAN_FEATURE_11AC u_int32_t vht_cap_info; diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c index e320448cdd30..d591acb9366e 100644 --- a/CORE/SME/src/btc/btcApi.c +++ b/CORE/SME/src/btc/btcApi.c @@ -980,13 +980,10 @@ static VOS_STATUS btcDeferAclComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent } else { - smsLog( pMac, LOGE, FL(" cannot find match for failed BT_EVENT_ACL_CONNECTION_COMPLETE of bdAddr (%02X-%02X-%02X-%02X-%02X-%02X)"), - pEvent->uEventParam.btAclConnection.bdAddr[0], - pEvent->uEventParam.btAclConnection.bdAddr[1], - pEvent->uEventParam.btAclConnection.bdAddr[2], - pEvent->uEventParam.btAclConnection.bdAddr[3], - pEvent->uEventParam.btAclConnection.bdAddr[4], - pEvent->uEventParam.btAclConnection.bdAddr[5]); + smsLog(pMac, LOGE, FL(" cannot find match for failed " + "BT_EVENT_ACL_CONNECTION_COMPLETE of bdAddr " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pEvent->uEventParam.btAclConnection.bdAddr)); status = VOS_STATUS_E_EMPTY; } }while(0); @@ -1152,13 +1149,10 @@ static VOS_STATUS btcDeferSyncComplete( tpAniSirGlobal pMac, tpSmeBtEvent pEvent } else { - smsLog( pMac, LOGE, FL(" cannot find match for BT_EVENT_SYNC_CONNECTION_COMPLETE of bdAddr (%02X-%02X-%02X-%02X-%02X-%02X)"), - pEvent->uEventParam.btSyncConnection.bdAddr[0], - pEvent->uEventParam.btSyncConnection.bdAddr[1], - pEvent->uEventParam.btSyncConnection.bdAddr[2], - pEvent->uEventParam.btSyncConnection.bdAddr[3], - pEvent->uEventParam.btSyncConnection.bdAddr[4], - pEvent->uEventParam.btSyncConnection.bdAddr[5]); + smsLog(pMac, LOGE, FL(" cannot find match for " + "BT_EVENT_SYNC_CONNECTION_COMPLETE of bdAddr " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pEvent->uEventParam.btSyncConnection.bdAddr)); status = VOS_STATUS_E_EMPTY; } }while(0); @@ -1721,6 +1715,7 @@ static void btcPowerOffloadStateCB(v_PVOID_t pContext, tANI_U32 sessionId, ---------------------------------------------------------------------------*/ static void btcLogEvent (tHalHandle hHal, tpSmeBtEvent pBtEvent) { + v_U8_t bdAddrRev[6]; VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "%s: " "Bluetooth Event %d received", __func__, pBtEvent->btEventType); switch(pBtEvent->btEventType) @@ -1737,14 +1732,16 @@ static void btcLogEvent (tHalHandle hHal, tpSmeBtEvent pBtEvent) pBtEvent->uEventParam.btSyncConnection.scoInterval, pBtEvent->uEventParam.btSyncConnection.scoWindow, pBtEvent->uEventParam.btSyncConnection.retransmisisonWindow); + + bdAddrRev[0] = pBtEvent->uEventParam.btSyncConnection.bdAddr[5]; + bdAddrRev[1] = pBtEvent->uEventParam.btSyncConnection.bdAddr[4]; + bdAddrRev[2] = pBtEvent->uEventParam.btSyncConnection.bdAddr[3]; + bdAddrRev[3] = pBtEvent->uEventParam.btSyncConnection.bdAddr[2]; + bdAddrRev[4] = pBtEvent->uEventParam.btSyncConnection.bdAddr[1]; + bdAddrRev[5] = pBtEvent->uEventParam.btSyncConnection.bdAddr[0]; + VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "BD ADDR = " - "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", - pBtEvent->uEventParam.btSyncConnection.bdAddr[5], - pBtEvent->uEventParam.btSyncConnection.bdAddr[4], - pBtEvent->uEventParam.btSyncConnection.bdAddr[3], - pBtEvent->uEventParam.btSyncConnection.bdAddr[2], - pBtEvent->uEventParam.btSyncConnection.bdAddr[1], - pBtEvent->uEventParam.btSyncConnection.bdAddr[0]); + MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bdAddrRev)); break; case BT_EVENT_CREATE_ACL_CONNECTION: case BT_EVENT_ACL_CONNECTION_COMPLETE: @@ -1752,14 +1749,16 @@ static void btcLogEvent (tHalHandle hHal, tpSmeBtEvent pBtEvent) "connectionHandle = %d status = %d ", pBtEvent->uEventParam.btAclConnection.connectionHandle, pBtEvent->uEventParam.btAclConnection.status); + + bdAddrRev[0] = pBtEvent->uEventParam.btAclConnection.bdAddr[5]; + bdAddrRev[1] = pBtEvent->uEventParam.btAclConnection.bdAddr[4]; + bdAddrRev[2] = pBtEvent->uEventParam.btAclConnection.bdAddr[3]; + bdAddrRev[3] = pBtEvent->uEventParam.btAclConnection.bdAddr[2]; + bdAddrRev[4] = pBtEvent->uEventParam.btAclConnection.bdAddr[1]; + bdAddrRev[5] = pBtEvent->uEventParam.btAclConnection.bdAddr[0]; + VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "BD ADDR = " - "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", - pBtEvent->uEventParam.btAclConnection.bdAddr[5], - pBtEvent->uEventParam.btAclConnection.bdAddr[4], - pBtEvent->uEventParam.btAclConnection.bdAddr[3], - pBtEvent->uEventParam.btAclConnection.bdAddr[2], - pBtEvent->uEventParam.btAclConnection.bdAddr[1], - pBtEvent->uEventParam.btAclConnection.bdAddr[0]); + MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bdAddrRev)); break; case BT_EVENT_MODE_CHANGED: VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, "ACL Mode change : " @@ -2015,13 +2014,10 @@ eHalStatus btcHandleCoexInd(tHalHandle hHal, void* pMsg) pMac->btc.btcBssfordisableaggr[3] = pSmeCoexInd->coexIndData[1] >> 8; pMac->btc.btcBssfordisableaggr[4] = pSmeCoexInd->coexIndData[2] & 0xFF; pMac->btc.btcBssfordisableaggr[5] = pSmeCoexInd->coexIndData[2] >> 8; - smsLog(pMac, LOGW, - "Coex indication in %s(), \ - type - SIR_COEX_IND_TYPE_DISABLE_AGGREGATION_IN_2p4 \ - for BSSID %02x:%02x:%02x:%02x:%02x:%02x",__func__, - pMac->btc.btcBssfordisableaggr[0],pMac->btc.btcBssfordisableaggr[1], - pMac->btc.btcBssfordisableaggr[2],pMac->btc.btcBssfordisableaggr[3], - pMac->btc.btcBssfordisableaggr[4],pMac->btc.btcBssfordisableaggr[5]); + smsLog(pMac, LOGW, "Coex indication in %s(), " + "type - SIR_COEX_IND_TYPE_DISABLE_AGGREGATION_IN_2p4 " + "for BSSID "MAC_ADDRESS_STR,__func__, + MAC_ADDR_ARRAY(pMac->btc.btcBssfordisableaggr)); } } else if (pSmeCoexInd->coexIndType == SIR_COEX_IND_TYPE_ENABLE_AGGREGATION_IN_2p4) diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 97d7a6312f27..3b5f5db25f46 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -2625,9 +2625,9 @@ eHalStatus csrRoamIssueDisassociate( tpAniSirGlobal pMac, tANI_U32 sessionId, } - smsLog( pMac, LOG2, "CSR Attempting to Disassociate Bssid=%02x-%02x-%02x-%02x-%02x-%02x" - "subState = %d reason=%d", bssId[ 0 ], bssId[ 1 ], bssId[ 2 ], bssId[ 3 ], - bssId[ 4 ], bssId[ 5 ], NewSubstate, reasonCode); + smsLog( pMac, LOG2, "CSR Attempting to Disassociate Bssid="MAC_ADDRESS_STR + " subState = %d reason=%d", + MAC_ADDR_ARRAY(bssId), NewSubstate, reasonCode); csrRoamSubstateChange( pMac, NewSubstate, sessionId); @@ -2756,9 +2756,8 @@ csrRoamIssueTkipCounterMeasures( tpAniSirGlobal pMac, tANI_U32 sessionId, smsLog( pMac, LOGE, "csrRoamIssueTkipCounterMeasures:Connected BSS Description in CSR Session not found"); return (status); } - smsLog( pMac, LOG2, "CSR issuing tkip counter measures for Bssid = %02x-%02x-%02x-%02x-%02x-%02x, Enable = %d", - bssId[ 0 ], bssId[ 1 ], bssId[ 2 ], - bssId[ 3 ], bssId[ 4 ], bssId[ 5 ], bEnable); + smsLog( pMac, LOG2, "CSR issuing tkip counter measures for Bssid = "MAC_ADDRESS_STR", Enable = %d", + MAC_ADDR_ARRAY(bssId), bEnable); status = csrSendMBTkipCounterMeasuresReqMsg( pMac, sessionId, bEnable, bssId ); return (status); } @@ -2784,9 +2783,8 @@ csrRoamGetAssociatedStas( tpAniSirGlobal pMac, tANI_U32 sessionId, smsLog( pMac, LOGE, "csrRoamGetAssociatedStas:Connected BSS Description in CSR Session not found"); return (status); } - smsLog( pMac, LOG2, "CSR getting associated stations for Bssid = %02x-%02x-%02x-%02x-%02x-%02x", - bssId[ 0 ], bssId[ 1 ], bssId[ 2 ], - bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] ); + smsLog( pMac, LOG2, "CSR getting associated stations for Bssid = "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(bssId)); status = csrSendMBGetAssociatedStasReqMsg( pMac, sessionId, modId, bssId, pUsrContext, pfnSapEventCallback, pAssocStasBuf ); return (status); } @@ -2812,9 +2810,8 @@ csrRoamGetWpsSessionOverlap( tpAniSirGlobal pMac, tANI_U32 sessionId, smsLog( pMac, LOGE, "csrRoamGetWpsSessionOverlap:Connected BSS Description in CSR Session not found"); return (status); } - smsLog( pMac, LOG2, "CSR getting WPS Session Overlap for Bssid = %02x-%02x-%02x-%02x-%02x-%02x", - bssId[ 0 ], bssId[ 1 ], bssId[ 2 ], - bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] ); + smsLog( pMac, LOG2, "CSR getting WPS Session Overlap for Bssid = "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(bssId)); status = csrSendMBGetWPSPBCSessions( pMac, sessionId, bssId, pUsrContext, pfnSapEventCallback, pRemoveMac); @@ -2836,9 +2833,8 @@ eHalStatus csrRoamIssueDeauth( tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoam { vos_mem_copy(&bssId, pSession->pConnectBssDesc->bssId, sizeof(tCsrBssid)); } - smsLog( pMac, LOG2, "CSR Attempting to Deauth Bssid= %02x-%02x-%02x-%02x-%02x-%02x", - bssId[ 0 ], bssId[ 1 ], bssId[ 2 ], - bssId[ 3 ], bssId[ 4 ], bssId[ 5 ] ); + smsLog( pMac, LOG2, "CSR Attempting to Deauth Bssid= "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(bssId)); csrRoamSubstateChange( pMac, NewSubstate, sessionId); status = csrSendMBDeauthReqMsg( pMac, sessionId, bssId, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON ); @@ -7316,9 +7312,8 @@ eHalStatus csrRoamIssueJoin( tpAniSirGlobal pMac, tANI_U32 sessionId, tSirBssDes tCsrRoamProfile *pProfile, tANI_U32 roamId ) { eHalStatus status; - smsLog( pMac, LOG1, "Attempting to Join Bssid= %02x-%02x-%02x-%02x-%02x-%02x", - pSirBssDesc->bssId[ 0 ],pSirBssDesc->bssId[ 1 ],pSirBssDesc->bssId[ 2 ], - pSirBssDesc->bssId[ 3 ],pSirBssDesc->bssId[ 4 ],pSirBssDesc->bssId[ 5 ] ); + smsLog( pMac, LOG1, "Attempting to Join Bssid= "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pSirBssDesc->bssId)); // Set the roaming substate to 'join attempt'... csrRoamSubstateChange( pMac, eCSR_ROAM_SUBSTATE_JOIN_REQ, sessionId); @@ -8545,14 +8540,9 @@ eHalStatus csrRoamIssueRemoveKeyCommand( tpAniSirGlobal pMac, tANI_U32 sessionId //in this case, put it to the end of the Q incase there is a set key pending. fImediate = eANI_BOOLEAN_FALSE; } - smsLog( pMac, LOGE, FL("keyType=%d, keyId=%d, PeerMac=%02x, %02x, %02x, %02x, %02x, %02x"), + smsLog( pMac, LOGE, FL("keyType=%d, keyId=%d, PeerMac="MAC_ADDRESS_STR), pRemoveKey->encType, pRemoveKey->keyId, - pCommand->u.removeKeyCmd.peerMac[0], - pCommand->u.removeKeyCmd.peerMac[1], - pCommand->u.removeKeyCmd.peerMac[2], - pCommand->u.removeKeyCmd.peerMac[3], - pCommand->u.removeKeyCmd.peerMac[4], - pCommand->u.removeKeyCmd.peerMac[5]); + MAC_ADDR_ARRAY(pCommand->u.removeKeyCmd.peerMac)); status = csrQueueSmeCommand(pMac, pCommand, fImediate); if( !HAL_STATUS_SUCCESS( status ) ) { @@ -9119,14 +9109,8 @@ void csrSendCcxAdjacentApRepInd(tpAniSirGlobal pMac, tCsrRoamSession *pSession) roamTS2 = vos_timer_get_system_time(); roamInfo.tsmRoamDelay = roamTS2 - pSession->roamTS1; - smsLog(pMac, LOG1, - "Bssid(%02X:%02X:%02X:%02X:%02X:%02X) Roaming Delay(%u ms)", - pSession->connectedProfile.bssid[0], - pSession->connectedProfile.bssid[1], - pSession->connectedProfile.bssid[2], - pSession->connectedProfile.bssid[3], - pSession->connectedProfile.bssid[4], - pSession->connectedProfile.bssid[5], + smsLog(pMac, LOG1, "Bssid("MAC_ADDRESS_STR") Roaming Delay(%u ms)", + MAC_ADDR_ARRAY(pSession->connectedProfile.bssid), roamInfo.tsmRoamDelay); pSessionEntry = peFindSessionByBssid(pMac, @@ -9187,9 +9171,8 @@ eHalStatus csrSendResetApCapsChanged(tpAniSirGlobal pMac, tSirMacAddr *bssId) pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; vos_mem_copy(pMsg->bssId, bssId, sizeof(tSirMacAddr)); - smsLog( pMac, LOG1, FL("CSR reset caps change for Bssid= %02x-%02x-%02x-%02x-%02x-%02x"), - pMsg->bssId[ 0 ], pMsg->bssId[ 1 ], pMsg->bssId[ 2 ], - pMsg->bssId[ 3 ], pMsg->bssId[ 4 ], pMsg->bssId[ 5 ]); + smsLog( pMac, LOG1, FL("CSR reset caps change for Bssid= "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pMsg->bssId)); status = palSendMBMessage(pMac->hHdd, pMsg); } else @@ -9980,9 +9963,9 @@ void csrRoamCheckForLinkStatusChange( tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg ) else { result = eCSR_ROAM_RESULT_FAILURE; - smsLog( pMac, LOGE, "CSR: Roam Completion setkey command failed(%d) PeerMac %02X-%02X-%02X-%02X-%02X-%02X...", - pRsp->statusCode, pRsp->peerMacAddr[0], pRsp->peerMacAddr[1], pRsp->peerMacAddr[2], - pRsp->peerMacAddr[3], pRsp->peerMacAddr[4], pRsp->peerMacAddr[5] ); + smsLog(pMac, LOGE, "CSR: Roam Completion setkey " + "command failed(%d) PeerMac "MAC_ADDRESS_STR, + pRsp->statusCode, MAC_ADDR_ARRAY(pRsp->peerMacAddr)); } csrRoamCallCallback(pMac, sessionId, &roamInfo, pCommand->u.setKeyCmd.roamId, eCSR_ROAM_SET_KEY_COMPLETE, result); @@ -12006,8 +11989,8 @@ eHalStatus csrRoamDelPMKIDfromCache( tpAniSirGlobal pMac, tANI_U32 sessionId, { for( Index=0; Index < pSession->NumPmkidCache; Index++ ) { - smsLog(pMac, LOGW, "Delete PMKID for %02X-%02X-%02X-%02X-%02X-%02X ", - pBSSId[0], pBSSId[1], pBSSId[2], pBSSId[3], pBSSId[4], pBSSId[5]); + smsLog(pMac, LOGW, "Delete PMKID for " + MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pBSSId)); if( vos_mem_compare( pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) ) { fMatchFound = TRUE; @@ -13362,9 +13345,8 @@ csrSendChngMCCBeaconInterval(tpAniSirGlobal pMac, tANI_U32 sessionId) // bssId vos_mem_copy((tSirMacAddr *)pMsg->bssId, &pSession->selfMacAddr, sizeof(tSirMacAddr)); - smsLog( pMac, LOG1, FL("CSR Attempting to change BI for Bssid= %02x-%02x-%02x-%02x-%02x-%02x "), - pMsg->bssId[ 0 ], pMsg->bssId[ 1 ], pMsg->bssId[ 2 ], - pMsg->bssId[ 3 ], pMsg->bssId[ 4 ], pMsg->bssId[ 5 ] ); + smsLog( pMac, LOG1, FL("CSR Attempting to change BI for Bssid= "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pMsg->bssId)); pMsg->sessionId = sessionId; smsLog(pMac, LOG1, FL(" session %d BeaconInterval %d"), sessionId, pMac->roam.roamSession[sessionId].bssParams.beaconInterval); pMsg->beaconInterval = pMac->roam.roamSession[sessionId].bssParams.beaconInterval; @@ -14097,13 +14079,8 @@ eHalStatus csrSendMBAddSelfStaReqMsg( tpAniSirGlobal pMac, pMsg->sessionId = sessionId; printk("session id - %d, AddSta session - %d\n", sessionId, pAddStaReq->sessionId); - smsLog( pMac, LOG1, FL("selfMac=%02x, %02x, %02x, %02x, %02x, %02x"), - pMsg->selfMacAddr[0], - pMsg->selfMacAddr[1], - pMsg->selfMacAddr[2], - pMsg->selfMacAddr[3], - pMsg->selfMacAddr[4], - pMsg->selfMacAddr[5]); + smsLog( pMac, LOG1, FL("selfMac="MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pMsg->selfMacAddr)); status = palSendMBMessage(pMac->hHdd, pMsg); } while( 0 ); return( status ); @@ -14581,9 +14558,8 @@ static void csrRoamLinkUp(tpAniSirGlobal pMac, tCsrBssid bssid) /* Update the current BSS info in ho control block based on connected profile info from pmac global structure */ - smsLog(pMac, LOGW, " csrRoamLinkUp: WLAN link UP with AP= %02x-%02x-%02x-%02x-%02x-%02x", - bssid[ 0 ], bssid[ 1 ], bssid[ 2 ], - bssid[ 3 ], bssid[ 4 ], bssid[ 5 ] ); + smsLog(pMac, LOGW, " csrRoamLinkUp: WLAN link UP with AP= "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(bssid)); /* Check for user misconfig of RSSI trigger threshold */ pMac->roam.configParam.vccRssiThreshold = ( 0 == pMac->roam.configParam.vccRssiThreshold ) ? diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index daadab1310ac..7d491721d61d 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -1949,13 +1949,9 @@ eHalStatus csrScanHandleCapChangeScanComplete(tpAniSirGlobal pMac, tANI_U32 sess }//Have scan result else { - smsLog(pMac, LOGW, FL("cannot find matching BSS of %02X-%02X-%02X-%02X-%02X-%02X"), - pSession->connectedProfile.bssid[0], - pSession->connectedProfile.bssid[1], - pSession->connectedProfile.bssid[2], - pSession->connectedProfile.bssid[3], - pSession->connectedProfile.bssid[4], - pSession->connectedProfile.bssid[5]); + smsLog(pMac, LOGW, FL("cannot find matching BSS of " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pSession->connectedProfile.bssid)); //Disconnect csrRoamDisconnectInternal(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); } @@ -2211,17 +2207,13 @@ eHalStatus csrScanGetResult(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, /* re-assign preference value based on modified rssi bucket */ pBssDesc->preferValue = csrGetBssPreferValue(pMac, (int)pBssDesc->Result.BssDescriptor.rssi); - smsLog(pMac, LOG2, FL("BSSID(%02X:%02X:%02X:%02X:%02X:%02X) Rssi(%d) Chnl(%d) PrefVal(%u) SSID=%.*s"), - pBssDesc->Result.BssDescriptor.bssId[0], - pBssDesc->Result.BssDescriptor.bssId[1], - pBssDesc->Result.BssDescriptor.bssId[2], - pBssDesc->Result.BssDescriptor.bssId[3], - pBssDesc->Result.BssDescriptor.bssId[4], - pBssDesc->Result.BssDescriptor.bssId[5], - pBssDesc->Result.BssDescriptor.rssi, - pBssDesc->Result.BssDescriptor.channelId, - pBssDesc->preferValue, - pBssDesc->Result.ssId.length, pBssDesc->Result.ssId.ssId); + smsLog(pMac, LOG2, FL("BSSID("MAC_ADDRESS_STR + ") Rssi(%d) Chnl(%d) PrefVal(%u) SSID=%.*s"), + MAC_ADDR_ARRAY(pBssDesc->Result.BssDescriptor.bssId), + pBssDesc->Result.BssDescriptor.rssi, + pBssDesc->Result.BssDescriptor.channelId, + pBssDesc->preferValue, + pBssDesc->Result.ssId.length, pBssDesc->Result.ssId.ssId); pEntry = csrLLNext(&pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK); } @@ -3030,10 +3022,8 @@ static void csrMoveTempScanResultsToMainList( tpAniSirGlobal pMac, tANI_U8 reaso { pBssDescription = GET_BASE_ADDR( pEntry, tCsrScanResult, Link ); - smsLog( pMac, LOGW, "...Bssid= %02x-%02x-%02x-%02x-%02x-%02x chan= %d, rssi = -%d", - pBssDescription->Result.BssDescriptor.bssId[ 0 ], pBssDescription->Result.BssDescriptor.bssId[ 1 ], - pBssDescription->Result.BssDescriptor.bssId[ 2 ], pBssDescription->Result.BssDescriptor.bssId[ 3 ], - pBssDescription->Result.BssDescriptor.bssId[ 4 ], pBssDescription->Result.BssDescriptor.bssId[ 5 ], + smsLog( pMac, LOGW, "...Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = -%d", + MAC_ADDR_ARRAY(pBssDescription->Result.BssDescriptor.bssId), pBssDescription->Result.BssDescriptor.channelId, pBssDescription->Result.BssDescriptor.rssi * (-1) ); @@ -4078,9 +4068,10 @@ tANI_BOOLEAN csrLearnCountryInformation( tpAniSirGlobal pMac, tSirBssDescription csrFreeScanFilter( pMac, &filter ); if(fMatch) { - smsLog(pMac, LOGW, " Matching roam profile BSSID %02X-%02X-%02X-%02X-%02X-%02X causing ambiguous domain info", - pSirBssDesc->bssId[0], pSirBssDesc->bssId[1], pSirBssDesc->bssId[2], - pSirBssDesc->bssId[3], pSirBssDesc->bssId[4], pSirBssDesc->bssId[5]); + smsLog(pMac, LOGW, "Matching roam profile " + "BSSID " MAC_ADDRESS_STR + " causing ambiguous domain info", + MAC_ADDR_ARRAY(pSirBssDesc->bssId)); pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_TRUE; break; } @@ -4092,9 +4083,10 @@ tANI_BOOLEAN csrLearnCountryInformation( tpAniSirGlobal pMac, tSirBssDescription //User doesn't give profile and just connect to anything. if(csrMatchBSSToConnectProfile(pMac, &pSession->connectedProfile, pSirBssDesc, pIesLocal)) { - smsLog(pMac, LOGW, " Matching connect profile BSSID %02X-%02X-%02X-%02X-%02X-%02X causing ambiguous domain info", - pSirBssDesc->bssId[0], pSirBssDesc->bssId[1], pSirBssDesc->bssId[2], - pSirBssDesc->bssId[3], pSirBssDesc->bssId[4], pSirBssDesc->bssId[5]); + smsLog(pMac, LOGW, "Matching connect profile BSSID " + MAC_ADDRESS_STR + " causing ambiguous domain info", + MAC_ADDR_ARRAY(pSirBssDesc->bssId)); //Tush pMac->scan.fAmbiguous11dInfoFound = eANI_BOOLEAN_TRUE; if(csrIsBssidMatch(pMac, (tCsrBssid *)&pSirBssDesc->bssId, @@ -5392,14 +5384,9 @@ tANI_BOOLEAN csrScanAgeOutBss(tpAniSirGlobal pMac, tCsrScanResult *pResult) pSession->pConnectBssDesc, NULL, FALSE)) ) { - smsLog(pMac, LOGW, "Aging out BSS %02X-%02X-%02X-%02X-%02X-%02X Channel %d", - pResult->Result.BssDescriptor.bssId[0], - pResult->Result.BssDescriptor.bssId[1], - pResult->Result.BssDescriptor.bssId[2], - pResult->Result.BssDescriptor.bssId[3], - pResult->Result.BssDescriptor.bssId[4], - pResult->Result.BssDescriptor.bssId[5], - pResult->Result.BssDescriptor.channelId); + smsLog(pMac, LOGW, "Aging out BSS "MAC_ADDRESS_STR" Channel %d", + MAC_ADDR_ARRAY(pResult->Result.BssDescriptor.bssId), + pResult->Result.BssDescriptor.channelId); //No need to hold the spin lock because caller should hold the lock for pMac->scan.scanResultList if( csrLLRemoveEntry(&pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_NOLOCK) ) { @@ -8215,11 +8202,9 @@ eHalStatus csrScanSavePreferredNetworkFound(tpAniSirGlobal pMac, vos_mem_copy((tANI_U8 *) &pBssDescr->bssId, (tANI_U8 *) macHeader->bssId, sizeof(tSirMacAddr)); pBssDescr->nReceivedTime = (tANI_TIMESTAMP)palGetTickCount(pMac->hHdd); - smsLog( pMac, LOG2, "(%s):Bssid= %02x-%02x-%02x-%02x-%02x-%02x " - "chan= %d, rssi = %d", __func__, - pBssDescr->bssId[ 0 ], pBssDescr->bssId[ 1 ], - pBssDescr->bssId[ 2 ], pBssDescr->bssId[ 3 ], - pBssDescr->bssId[ 4 ], pBssDescr->bssId[ 5 ], + smsLog( pMac, LOG2, "(%s):Bssid= "MAC_ADDRESS_STR + " chan= %d, rssi = %d", __func__, + MAC_ADDR_ARRAY(pBssDescr->bssId), pBssDescr->channelId, pBssDescr->rssi ); @@ -8345,17 +8330,11 @@ eHalStatus csrScanCreateEntryInScanCache(tpAniSirGlobal pMac, tANI_U32 sessionId return status; } smsLog(pMac, LOG2, FL("csrScanCreateEntryInScanCache: Current bssid::" - "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x"), - pSession->pConnectBssDesc->bssId[0], - pSession->pConnectBssDesc->bssId[1], - pSession->pConnectBssDesc->bssId[2], - pSession->pConnectBssDesc->bssId[3], - pSession->pConnectBssDesc->bssId[4], - pSession->pConnectBssDesc->bssId[5]); + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pSession->pConnectBssDesc->bssId)); smsLog(pMac, LOG2, FL("csrScanCreateEntryInScanCache: My bssid::" - "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x channel %d"), - bssid[0],bssid[1],bssid[2], - bssid[3],bssid[4],bssid[5],channel); + MAC_ADDRESS_STR" channel %d"), + MAC_ADDR_ARRAY(bssid), channel); do { diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c index 71c1aecfef44..8e33d813982d 100644 --- a/CORE/SME/src/csr/csrNeighborRoam.c +++ b/CORE/SME/src/csr/csrNeighborRoam.c @@ -1001,8 +1001,8 @@ eHalStatus csrNeighborRoamAddBssIdToPreauthFailList(tpAniSirGlobal pMac, tSirMac { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo; - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL(" Added BSSID %02x:%02x:%02x:%02x:%02x:%02x to Preauth failed list"), - bssId[0], bssId[1], bssId[2], bssId[3], bssId[4], bssId[5]); + NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL(" Added BSSID "MAC_ADDRESS_STR" to Preauth failed list"), + MAC_ADDR_ARRAY(bssId)); if ((pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress + 1) > @@ -1051,8 +1051,8 @@ tANI_BOOLEAN csrNeighborRoamIsPreauthCandidate(tpAniSirGlobal pMac, tSirMacAddr if (VOS_TRUE == vos_mem_compare(pNeighborRoamInfo->FTRoamInfo.preAuthFailList.macAddress[i], bssId, sizeof(tSirMacAddr))) { - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("BSSID %02x:%02x:%02x:%02x:%02x:%02x already present in preauth fail list"), - bssId[0], bssId[1], bssId[2], bssId[3], bssId[4], bssId[5]); + NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("BSSID "MAC_ADDRESS_STR" already present in preauth fail list"), + MAC_ADDR_ARRAY(bssId)); return eANI_BOOLEAN_FALSE; } } @@ -1124,13 +1124,8 @@ static eHalStatus csrNeighborRoamIssuePreauthReq(tpAniSirGlobal pMac) status = csrRoamEnqueuePreauth(pMac, pNeighborRoamInfo->csrSessionId, pNeighborBssNode->pBssDescription, eCsrPerformPreauth, eANI_BOOLEAN_TRUE); - smsLog(pMac, LOG1, FL("Before Pre-Auth: BSSID %02x:%02x:%02x:%02x:%02x:%02x, Ch:%d"), - pNeighborBssNode->pBssDescription->bssId[0], - pNeighborBssNode->pBssDescription->bssId[1], - pNeighborBssNode->pBssDescription->bssId[2], - pNeighborBssNode->pBssDescription->bssId[3], - pNeighborBssNode->pBssDescription->bssId[4], - pNeighborBssNode->pBssDescription->bssId[5], + smsLog(pMac, LOG1, FL("Before Pre-Auth: BSSID "MAC_ADDRESS_STR", Ch:%d"), + MAC_ADDR_ARRAY(pNeighborBssNode->pBssDescription->bssId), (int)pNeighborBssNode->pBssDescription->channelId); if (eHAL_STATUS_SUCCESS != status) @@ -1217,13 +1212,8 @@ eHalStatus csrNeighborRoamPreauthRspHandler(tpAniSirGlobal pMac, tSirRetStatus l { NEIGHBOR_ROAM_DEBUG(pMac, LOG1, FL("Preauth completed successfully after %d tries"), pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries); - smsLog(pMac, LOG1, FL("After Pre-Auth: BSSID %02x:%02x:%02x:%02x:%02x:%02x, Ch:%d"), - pPreauthRspNode->pBssDescription->bssId[0], - pPreauthRspNode->pBssDescription->bssId[1], - pPreauthRspNode->pBssDescription->bssId[2], - pPreauthRspNode->pBssDescription->bssId[3], - pPreauthRspNode->pBssDescription->bssId[4], - pPreauthRspNode->pBssDescription->bssId[5], + smsLog(pMac, LOG1, FL("After Pre-Auth: BSSID "MAC_ADDRESS_STR", Ch:%d"), + MAC_ADDR_ARRAY(pPreauthRspNode->pBssDescription->bssId), (int)pPreauthRspNode->pBssDescription->channelId); #ifdef FEATURE_WLAN_LFR_METRICS @@ -1553,13 +1543,8 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, while (NULL != (pScanResult = csrScanResultGetNext(pMac, *pScanResultList))) { VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG, - FL("Scan result: BSSID %02x:%02x:%02x:%02x:%02x:%02x (Rssi %ld, Ch:%d)"), - pScanResult->BssDescriptor.bssId[0], - pScanResult->BssDescriptor.bssId[1], - pScanResult->BssDescriptor.bssId[2], - pScanResult->BssDescriptor.bssId[3], - pScanResult->BssDescriptor.bssId[4], - pScanResult->BssDescriptor.bssId[5], + FL("Scan result: BSSID "MAC_ADDRESS_STR" (Rssi %ld, Ch:%d)"), + MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId), abs(pScanResult->BssDescriptor.rssi), pScanResult->BssDescriptor.channelId); @@ -1678,13 +1663,8 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, if (pScanResult->BssDescriptor.QBSSLoad_avail < pNeighborRoamInfo->MinQBssLoadRequired) { VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "[INFOLOG]BSSID : %02x:%02x:%02x:%02x:%02x:%02x has no bandwidth ignoring..not adding to roam list", - pScanResult->BssDescriptor.bssId[0], - pScanResult->BssDescriptor.bssId[1], - pScanResult->BssDescriptor.bssId[2], - pScanResult->BssDescriptor.bssId[3], - pScanResult->BssDescriptor.bssId[4], - pScanResult->BssDescriptor.bssId[5]); + "[INFOLOG]BSSID : "MAC_ADDRESS_STR" has no bandwidth ignoring..not adding to roam list", + MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId)); continue; } } @@ -1695,13 +1675,8 @@ static tANI_BOOLEAN csrNeighborRoamProcessScanResults(tpAniSirGlobal pMac, if (pNeighborRoamInfo->isVOAdmitted) { VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - "[INFOLOG]BSSID : %02x:%02x:%02x:%02x:%02x:%02x has no QBSSLoad IE, ignoring..not adding to roam list", - pScanResult->BssDescriptor.bssId[0], - pScanResult->BssDescriptor.bssId[1], - pScanResult->BssDescriptor.bssId[2], - pScanResult->BssDescriptor.bssId[3], - pScanResult->BssDescriptor.bssId[4], - pScanResult->BssDescriptor.bssId[5]); + "[INFOLOG]BSSID : "MAC_ADDRESS_STR" has no QBSSLoad IE, ignoring..not adding to roam list", + MAC_ADDR_ARRAY(pScanResult->BssDescriptor.bssId)); continue; } } @@ -4697,13 +4672,8 @@ void csrNeighborRoamRequestHandoff(tpAniSirGlobal pMac) csrNeighborRoamGetHandoffAPInfo(pMac, &handoffNode); VOS_TRACE (VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_DEBUG, - FL("HANDOFF CANDIDATE BSSID %02x:%02x:%02x:%02x:%02x:%02x"), - handoffNode.pBssDescription->bssId[0], - handoffNode.pBssDescription->bssId[1], - handoffNode.pBssDescription->bssId[2], - handoffNode.pBssDescription->bssId[3], - handoffNode.pBssDescription->bssId[4], - handoffNode.pBssDescription->bssId[5]); + FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(handoffNode.pBssDescription->bssId)); #ifdef FEATURE_WLAN_LFR_METRICS /* LFR metrics - pre-auth completion metric. diff --git a/CORE/SME/src/csr/csrTdlsProcess.c b/CORE/SME/src/csr/csrTdlsProcess.c index ff8ed3847c4a..00a084c4774c 100644 --- a/CORE/SME/src/csr/csrTdlsProcess.c +++ b/CORE/SME/src/csr/csrTdlsProcess.c @@ -648,9 +648,8 @@ eHalStatus csrTdlsProcessDelSta( tpAniSirGlobal pMac, tSmeCmd *cmd ) #else smsLog( pMac, LOG1, #endif - "sending TDLS Del Sta %02x:%02x:%02x:%02x:%02x:%02x req to PE", - tdlsDelStaCmdInfo->peerMac[0], tdlsDelStaCmdInfo->peerMac[1], tdlsDelStaCmdInfo->peerMac[2], - tdlsDelStaCmdInfo->peerMac[3], tdlsDelStaCmdInfo->peerMac[4], tdlsDelStaCmdInfo->peerMac[5]); + "sending TDLS Del Sta "MAC_ADDRESS_STR" req to PE", + MAC_ADDR_ARRAY(tdlsDelStaCmdInfo->peerMac)); status = tdlsSendMessage(pMac, eWNI_SME_TDLS_DEL_STA_REQ, (void *)tdlsDelStaReq , sizeof(tSirTdlsDelStaReq)) ; if(!HAL_STATUS_SUCCESS( status ) ) @@ -1144,15 +1143,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac, v_U16_t msgType, { tSirTdlsPeerInfo *peerInfo = &disRsp->tdlsDisPeerInfo[i] ; VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - ("SME, peer MAC:")) ; - VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - (" %02x,%02x,%02x,%02x,%02x,%02x"), - peerInfo->peerMac[0], - peerInfo->peerMac[1], - peerInfo->peerMac[2], - peerInfo->peerMac[3], - peerInfo->peerMac[4], - peerInfo->peerMac[5]) ; + ("SME, peer MAC: "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(peerInfo->peerMac)); peerLinkInfo = findTdlsPeer(pMac, &disInfo->tdlsPotentialPeerList, @@ -1198,13 +1190,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac, v_U16_t msgType, if(eSIR_SME_SUCCESS == linkSetupRsp->statusCode) { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - ("Link setup for Peer %02x,%02x,%02x,%02x,%02x,%02x"), - linkSetupRsp->peerMac[0], - linkSetupRsp->peerMac[1], - linkSetupRsp->peerMac[2], - linkSetupRsp->peerMac[3], - linkSetupRsp->peerMac[4], - linkSetupRsp->peerMac[5]) ; + ("Link setup for Peer "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(linkSetupRsp->peerMac)); tdlsUpdateTdlsPeerState(pMac, linkSetupRsp->peerMac, TDLS_LINK_SETUP_STATE) ; @@ -1232,13 +1219,8 @@ eHalStatus tdlsMsgProcessor(tpAniSirGlobal pMac, v_U16_t msgType, { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO, - ("Teardown peer MAC = %02x,%02x,%02x,%02x,%02x,%02x"), - linkTearRsp->peerMac[0], - linkTearRsp->peerMac[1], - linkTearRsp->peerMac[2], - linkTearRsp->peerMac[3], - linkTearRsp->peerMac[4], - linkTearRsp->peerMac[5]) ; + ("Teardown peer MAC = "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(linkTearRsp->peerMac)); tdlsDeleteTdlsPeerInfo(pMac, linkTearRsp->peerMac) ; } else diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index 76f7fdb37498..761ceb30cefc 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -3730,8 +3730,8 @@ tANI_BOOLEAN csrLookupPMKID( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U8 *p { for( Index=0; Index < pSession->NumPmkidCache; Index++ ) { - smsLog(pMac, LOGW, "match PMKID %02X-%02X-%02X-%02X-%02X-%02X to ", - pBSSId[0], pBSSId[1], pBSSId[2], pBSSId[3], pBSSId[4], pBSSId[5]); + smsLog(pMac, LOGW, "match PMKID "MAC_ADDRESS_STR " to ", + MAC_ADDR_ARRAY(pBSSId)); if( vos_mem_compare(pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid)) ) { // match found @@ -4016,8 +4016,8 @@ tANI_BOOLEAN csrLookupBKID( tpAniSirGlobal pMac, tANI_U32 sessionId, tANI_U8 *pB { for( Index=0; Index < pSession->NumBkidCache; Index++ ) { - smsLog(pMac, LOGW, "match BKID %02X-%02X-%02X-%02X-%02X-%02X to ", - pBSSId[0], pBSSId[1], pBSSId[2], pBSSId[3], pBSSId[4], pBSSId[5]); + smsLog(pMac, LOGW, "match BKID "MAC_ADDRESS_STR" to ", + MAC_ADDR_ARRAY(pBSSId)); if (vos_mem_compare(pBSSId, pSession->BkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) ) { // match found diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c index a5b83951595b..b86a1a6dee1d 100644 --- a/CORE/SME/src/rrm/sme_rrm.c +++ b/CORE/SME/src/rrm/sme_rrm.c @@ -233,13 +233,8 @@ static eHalStatus sme_RrmSendBeaconReportXmitInd( tpAniSirGlobal pMac, vos_mem_copy( &pBeaconRep->pBssDescription[msgCounter]->ieFields[0], pBssDesc->ieFields, ie_len ); smsLog( pMac, LOG1, - "...RRM Result Bssid = %02x-%02x-%02x-%02x-%02x-%02x chan= %d, rssi = -%d", - pBeaconRep->pBssDescription[msgCounter]->bssId[ 0 ], - pBeaconRep->pBssDescription[msgCounter]->bssId[ 1 ], - pBeaconRep->pBssDescription[msgCounter]->bssId[ 2 ], - pBeaconRep->pBssDescription[msgCounter]->bssId[ 3 ], - pBeaconRep->pBssDescription[msgCounter]->bssId[ 4 ], - pBeaconRep->pBssDescription[msgCounter]->bssId[ 5 ], + "...RRM Result Bssid = "MAC_ADDRESS_STR" chan= %d, rssi = -%d", + MAC_ADDR_ARRAY(pBeaconRep->pBssDescription[msgCounter]->bssId), pBeaconRep->pBssDescription[msgCounter]->channelId, pBeaconRep->pBssDescription[msgCounter]->rssi * (-1)); @@ -389,9 +384,8 @@ static eHalStatus sme_CcxSendBeaconReqScanResults(tpAniSirGlobal pMac, } pBcnReport->bcnRepBssInfo[msgCounter].ieLen = outIeLen; - smsLog( pMac, LOG1,"Bssid(%02X:%02X:%02X:%02X:%02X:%02X) Channel=%d Rssi=%d", - pBssDesc->bssId[0], pBssDesc->bssId[1], pBssDesc->bssId[2], - pBssDesc->bssId[3], pBssDesc->bssId[4], pBssDesc->bssId[5], + smsLog( pMac, LOG1,"Bssid("MAC_ADDRESS_STR") Channel=%d Rssi=%d", + MAC_ADDR_ARRAY(pBssDesc->bssId), pBssDesc->channelId, (-1) * pBssDesc->rssi); pBcnReport->numBss++; @@ -1165,13 +1159,8 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf) sizeof(tSirNeighborBssDescription)); #if defined WLAN_VOWIFI_DEBUG - smsLog( pMac, LOGE, "Received neighbor report with Neighbor BSSID: %02x:%02x:%02x:%02x:%02x:%02x ", - pNeighborRpt->sNeighborBssDescription[i].bssId[0], - pNeighborRpt->sNeighborBssDescription[i].bssId[1], - pNeighborRpt->sNeighborBssDescription[i].bssId[2], - pNeighborRpt->sNeighborBssDescription[i].bssId[3], - pNeighborRpt->sNeighborBssDescription[i].bssId[4], - pNeighborRpt->sNeighborBssDescription[i].bssId[5]); + smsLog( pMac, LOGE, "Received neighbor report with Neighbor BSSID: "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pNeighborRpt->sNeighborBssDescription[i].bssId)); #endif /* Calculate the roam score based on the BSS Capability in the BSSID Information and store it in Neighbor report Desc */ @@ -1184,13 +1173,8 @@ eHalStatus sme_RrmProcessNeighborReport(tpAniSirGlobal pMac, void *pMsgBuf) } else { - smsLog(pMac, LOGE, FL("Roam score of BSSID %02x:%02x:%02x:%02x:%02x:%02x is 0, Ignoring.."), - pNeighborRpt->sNeighborBssDescription[i].bssId[0], - pNeighborRpt->sNeighborBssDescription[i].bssId[1], - pNeighborRpt->sNeighborBssDescription[i].bssId[2], - pNeighborRpt->sNeighborBssDescription[i].bssId[3], - pNeighborRpt->sNeighborBssDescription[i].bssId[4], - pNeighborRpt->sNeighborBssDescription[i].bssId[5]); + smsLog(pMac, LOGE, FL("Roam score of BSSID "MAC_ADDRESS_STR" is 0, Ignoring.."), + MAC_ADDR_ARRAY(pNeighborRpt->sNeighborBssDescription[i].bssId)); vos_mem_free(pNeighborReportDesc->pNeighborBssDescription); vos_mem_free(pNeighborReportDesc); diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index 5ca56a9566d7..849fd4d74239 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -6599,10 +6599,8 @@ eHalStatus smeIssueFastRoamNeighborAPEvent (tHalHandle hHal, pNeighborRoamInfo->cfgRoamEn = eSME_ROAM_TRIGGER_SCAN; vos_mem_copy((void *)(&pNeighborRoamInfo->cfgRoambssId), (void *)bssid, sizeof(tSirMacAddr)); - smsLog(pMac, LOG1, "Calling Roam Look Up down Event BSSID %x %x %x %x %x %x", - pNeighborRoamInfo->cfgRoambssId[0], pNeighborRoamInfo->cfgRoambssId[1], - pNeighborRoamInfo->cfgRoambssId[2], pNeighborRoamInfo->cfgRoambssId[3], - pNeighborRoamInfo->cfgRoambssId[4], pNeighborRoamInfo->cfgRoambssId[5]); + smsLog(pMac, LOG1, "Calling Roam Look Up down Event BSSID " + MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pNeighborRoamInfo->cfgRoambssId)); vosStatus = csrNeighborRoamTransitToCFGChanScan(pMac); if (VOS_STATUS_SUCCESS != vosStatus) @@ -6617,10 +6615,8 @@ eHalStatus smeIssueFastRoamNeighborAPEvent (tHalHandle hHal, vos_mem_copy((void *)(&pNeighborRoamInfo->cfgRoambssId), (void *)bssid, sizeof(tSirMacAddr)); pNeighborRoamInfo->cfgRoamEn = eSME_ROAM_TRIGGER_FAST_ROAM; - smsLog(pMac, LOG1, "Roam to BSSID %x-%x-%x-%x-%x-%x", - pNeighborRoamInfo->cfgRoambssId[0], pNeighborRoamInfo->cfgRoambssId[1], - pNeighborRoamInfo->cfgRoambssId[2], pNeighborRoamInfo->cfgRoambssId[3], - pNeighborRoamInfo->cfgRoambssId[4], pNeighborRoamInfo->cfgRoambssId[5]); + smsLog(pMac, LOG1, "Roam to BSSID "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pNeighborRoamInfo->cfgRoambssId)); vosStatus = csrNeighborRoamReassocIndCallback(pMac->roam.gVosContext, 0, diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c index 9901e3d0e27d..17c7375bf2f0 100644 --- a/CORE/SME/src/sme_common/sme_FTApi.c +++ b/CORE/SME/src/sme_common/sme_FTApi.c @@ -327,9 +327,8 @@ eHalStatus sme_FTSendUpdateKeyInd(tHalHandle hHal, tCsrRoamSetKey * pFTKeyInfo) &pFTKeyInfo->peerMac[ 0 ], sizeof(tCsrBssid) ); - smsLog(pMac, LOG1, "BSSID = %02X-%02X-%02X-%02X-%02X-%02X", - pMsg->bssId[0], pMsg->bssId[1], pMsg->bssId[2], - pMsg->bssId[3], pMsg->bssId[4], pMsg->bssId[5]); + smsLog(pMac, LOG1, "BSSID = "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pMsg->bssId)); status = palSendMBMessage(pMac->hHdd, pMsg); diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c index bc8b89020747..b84aa81de21f 100644 --- a/CORE/SYS/common/src/wlan_qct_sys.c +++ b/CORE/SYS/common/src/wlan_qct_sys.c @@ -199,8 +199,8 @@ typedef struct sPolFileHeader { tPolFileVersion FileVersion; tPolFileVersion HWCapabilities; - unsigned long FileLength; - unsigned long NumDirectoryEntries; + unsigned int FileLength; + unsigned int NumDirectoryEntries; } tPolFileHeader; @@ -219,9 +219,9 @@ typedef enum ePolFileDirTypes typedef struct sPolFileDirEntry { - unsigned long DirEntryType; - unsigned long DirEntryFileOffset; - unsigned long DirEntryLength; + unsigned int DirEntryType; + unsigned int DirEntryFileOffset; + unsigned int DirEntryLength; } tPolFileDirEntry; diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c index f6c9facec4b8..60438bd37829 100644 --- a/CORE/TL/src/wlan_qct_tl.c +++ b/CORE/TL/src/wlan_qct_tl.c @@ -531,7 +531,7 @@ WLANTL_Open pTLCb->reorderBufferPool = vos_mem_malloc(sizeof(WLANTL_REORDER_BUFFER_T) * WLANTL_MAX_BA_SESSION); if (NULL == pTLCb->reorderBufferPool) { - TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "WLAN TL: Reorder buffer allocation failed\n")); + TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, "WLAN TL: Reorder buffer allocation failed")); WLANTL_FreeClientMemory(pTLCb->atlSTAClients); vos_free_context(pvosGCtx, VOS_MODULE_ID_TL, pTLCb); return VOS_STATUS_E_FAULT; @@ -5285,7 +5285,7 @@ WLANTL_ProcessFCFrame wpalReadRegister(0x03081400+0x1D4, &curTick); TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "%ld (%ld-%ld): Disabled %x Valid %x\n", curTick > rxTimeStamp ? curTick - rxTimeStamp : rxTimeStamp - (0xFFFFFFFF - curTick), + "%ld (%ld-%ld): Disabled %x Valid %x", curTick > rxTimeStamp ? curTick - rxTimeStamp : rxTimeStamp - (0xFFFFFFFF - curTick), curTick, rxTimeStamp, ucStaTxDisabledBitmap, ucStaValidBitmap)); #endif for(ucSTAId = 0; ucStaValidBitmap != 0; ucStaValidBitmap >>=1, ucStaTxDisabledBitmap >>= 1, ucSTAId ++) @@ -5315,7 +5315,7 @@ WLANTL_ProcessFCFrame if ( (NULL == pTLCb) || (NULL == pvosDataBuff)) { TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL:Invalid pointer in %s \n", __func__)); + "WLAN TL:Invalid pointer in %s", __func__)); return VOS_STATUS_E_FAULT; } vosStatus = vos_pkt_peek_data( pvosDataBuff, 0, (v_PVOID_t)&pvFcRxBd, @@ -5350,7 +5350,7 @@ WLANTL_ProcessFCFrame else { TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW, - "WLAN TL: FW report LWM event but the station %d is not in LWM mode \n", ucSTAId)); + "WLAN TL: FW report LWM event but the station %d is not in LWM mode", ucSTAId)); } } @@ -5369,7 +5369,7 @@ WLANTL_ProcessFCFrame ) { TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "WLAN TL:Enable LWM mode for station %d\n", ucSTAId)); + "WLAN TL:Enable LWM mode for station %d", ucSTAId)); pTLCb->atlSTAClients[ucSTAId].ucLwmModeEnabled = TRUE; } else @@ -5377,7 +5377,7 @@ WLANTL_ProcessFCFrame if( pTLCb->atlSTAClients[ucSTAId].ucLwmModeEnabled ) { TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "WLAN TL:Disable LWM mode for station %d\n", ucSTAId)); + "WLAN TL:Disable LWM mode for station %d", ucSTAId)); pTLCb->atlSTAClients[ucSTAId].ucLwmModeEnabled = FALSE; } @@ -5719,7 +5719,7 @@ WLANTL_RxFrames (WLANTL_STA_AUTHENTICATED == pTLCb->atlSTAClients[ucAddr3STAId]->tlState))) { TLLOGW(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_WARN, - "%s: staId %d addr3Id %d tlState %d. Unkown Receiver/Transmitter Dropping packet\n", __func__, + "%s: staId %d addr3Id %d tlState %d. Unkown Receiver/Transmitter Dropping packet", __func__, ucSTAId, ucAddr3STAId, pTLCb->atlSTAClients[ucAddr3STAId]->tlState)); vos_pkt_return_packet(vosTempBuff); vosTempBuff = vosDataBuff; @@ -5728,7 +5728,7 @@ WLANTL_RxFrames else { TLLOGW(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_WARN, - "%s: staId %d doesn't exist, but mapped to AP staId %d \n", __func__, + "%s: staId %d doesn't exist, but mapped to AP staId %d", __func__, ucSTAId, ucAddr3STAId)); ucSTAId = ucAddr3STAId; pClientSTA = pTLCb->atlSTAClients[ucAddr3STAId]; @@ -5751,7 +5751,7 @@ WLANTL_RxFrames uDPUSig = WDA_GET_RX_DPUSIG( pvBDHeader ); //Station has not yet been registered with TL - cache the frame TLLOGW(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_WARN, - "%s: staId %d exist %d tlState %d cache rx frame \n", __func__, ucSTAId, + "%s: staId %d exist %d tlState %d cache rx frame", __func__, ucSTAId, pClientSTA->ucExists, pClientSTA->tlState)); WLANTL_CacheSTAFrame( pTLCb, ucSTAId, vosTempBuff, uDPUSig, broadcast, ucFrmType); vosTempBuff = vosDataBuff; @@ -7313,7 +7313,7 @@ WLANTL_STATxAuth } TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW, - "WLAN TL software translation success \n")); + "WLAN TL software translation success")); ucSwFrmXtl = 1; tlMetaInfo.ucDisableFrmXtl = 1; } @@ -7709,7 +7709,7 @@ WLANTL_STARxConn wRxMetaInfo.ucUP = ucTid; TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW, - "WLAN TL %s:Sending data chain to station \n", __func__)); + "WLAN TL %s:Sending data chain to station", __func__)); if ( WLAN_STA_SOFTAP == pClientSTA->wSTADesc.wSTAType ) { wRxMetaInfo.ucDesSTAId = WLAN_RX_SAP_SELF_STA_ID; @@ -7828,21 +7828,21 @@ WLANTL_FwdPktToHDD if ( VOS_STATUS_SUCCESS != vosStatus ) { TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL: recv corrupted data packet\n")); + "WLAN TL: recv corrupted data packet")); vos_pkt_return_packet(vosDataBuff); return vosStatus; } - TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,"station mac 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x \n", - pDestMacAddress->bytes[0], pDestMacAddress->bytes[1], pDestMacAddress->bytes[2], - pDestMacAddress->bytes[3], pDestMacAddress->bytes[4], pDestMacAddress->bytes[5])); + TLLOG4(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW, + "station mac "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(pDestMacAddress->bytes))); if (vos_is_macaddr_broadcast( pDestMacAddress ) || vos_is_macaddr_group(pDestMacAddress)) { // destination is mc/bc station ucDesSTAId = WLAN_RX_BCMC_STA_ID; TLLOG4(VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, - "%s: BC/MC packet, id %d\n", __func__, WLAN_RX_BCMC_STA_ID)); + "%s: BC/MC packet, id %d", __func__, WLAN_RX_BCMC_STA_ID)); } else { @@ -7851,13 +7851,13 @@ WLANTL_FwdPktToHDD // destination is AP itself ucDesSTAId = WLAN_RX_SAP_SELF_STA_ID; TLLOG4(VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, - "%s: packet to AP itself, id %d\n", __func__, WLAN_RX_SAP_SELF_STA_ID)); + "%s: packet to AP itself, id %d", __func__, WLAN_RX_SAP_SELF_STA_ID)); } else if (( WLAN_MAX_STA_COUNT <= ucDesSTAId ) || (NULL != pTLCb->atlSTAClients[ucDesSTAId] && pTLCb->atlSTAClients[ucDesSTAId]->ucExists == 0)) { // destination station is something else TLLOG4(VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, - "%s: get an station index larger than WLAN_MAX_STA_COUNT %d\n", __func__, ucDesSTAId)); + "%s: get an station index larger than WLAN_MAX_STA_COUNT %d", __func__, ucDesSTAId)); ucDesSTAId = WLAN_RX_SAP_SELF_STA_ID; } @@ -7873,7 +7873,7 @@ WLANTL_FwdPktToHDD if ( VOS_STATUS_SUCCESS != vosStatus ) { TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL: failed to send pkt to HDD \n")); + "WLAN TL: failed to send pkt to HDD")); vos_pkt_return_packet(vosDataBuff); return vosStatus; @@ -8191,13 +8191,13 @@ if(0 == ucUnicastBroadcastType ullcurrentReplayCounter = WDA_DS_GetReplayCounter(aucBDHeader); VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO, - "WLAN TL: AMSDU currentReplayCounter [0x%llX]\n",ullcurrentReplayCounter); + "WLAN TL: AMSDU currentReplayCounter [0x%llX]",ullcurrentReplayCounter); /* Getting 48-bit previous replay counter from TL control block */ ullpreviousReplayCounter = pClientSTA->ullReplayCounter[ucTid]; VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO, - "WLAN TL: AMSDU previousReplayCounter [0x%llX]\n",ullpreviousReplayCounter); + "WLAN TL: AMSDU previousReplayCounter [0x%llX]",ullpreviousReplayCounter); /* It is first subframe of AMSDU thus it conatains replay counter perform the @@ -8211,11 +8211,11 @@ if(0 == ucUnicastBroadcastType else { VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL: AMSDU Drop the replay packet with PN : [0x%llX]\n",ullcurrentReplayCounter); + "WLAN TL: AMSDU Drop the replay packet with PN : [0x%llX]",ullcurrentReplayCounter); pClientSTA->ulTotalReplayPacketsDetected++; VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL: AMSDU total dropped replay packets on STA ID %X is [0x%X]\n", + "WLAN TL: AMSDU total dropped replay packets on STA ID %X is [0x%X]", ucSTAId, pClientSTA->ulTotalReplayPacketsDetected); /* Drop the packet */ @@ -8232,13 +8232,13 @@ if(0 == ucUnicastBroadcastType ullcurrentReplayCounter = WDA_DS_GetReplayCounter(aucBDHeader); VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO, - "WLAN TL: Non-AMSDU currentReplayCounter [0x%llX]\n",ullcurrentReplayCounter); + "WLAN TL: Non-AMSDU currentReplayCounter [0x%llX]",ullcurrentReplayCounter); /* Getting 48-bit previous replay counter from TL control block */ ullpreviousReplayCounter = pClientSTA->ullReplayCounter[ucTid]; VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO, - "WLAN TL: Non-AMSDU previousReplayCounter [0x%llX]\n",ullpreviousReplayCounter); + "WLAN TL: Non-AMSDU previousReplayCounter [0x%llX]",ullpreviousReplayCounter); /* It is not AMSDU frame so perform reaply check for each packet, as @@ -8252,11 +8252,11 @@ if(0 == ucUnicastBroadcastType else { VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL: Non-AMSDU Drop the replay packet with PN : [0x%llX]\n",ullcurrentReplayCounter); + "WLAN TL: Non-AMSDU Drop the replay packet with PN : [0x%llX]",ullcurrentReplayCounter); pClientSTA->ulTotalReplayPacketsDetected++; VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLAN TL: Non-AMSDU total dropped replay packets on STA ID %X is [0x%X]\n", + "WLAN TL: Non-AMSDU total dropped replay packets on STA ID %X is [0x%X]", ucSTAId, pClientSTA->ulTotalReplayPacketsDetected); /* Repaly packet, drop the packet */ @@ -9380,7 +9380,7 @@ WLANTL_Translate8023To80211Header vos_mem_copy( pw80211Header->optvA4, w8023Header.vSA, VOS_MAC_ADDR_SIZE); TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "BTAMP CASE NOW ---------staid=%d\n", + "BTAMP CASE NOW ---------staid=%d", ucStaId)); break; @@ -9395,7 +9395,7 @@ WLANTL_Translate8023To80211Header vos_mem_copy( pw80211Header->vA3, w8023Header.vSA, VOS_MAC_ADDR_SIZE); TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "sw 802 to 80211 softap case ---------staid=%d\n", + "sw 802 to 80211 softap case ---------staid=%d", ucStaId)); break; #ifdef FEATURE_WLAN_TDLS @@ -9409,7 +9409,7 @@ WLANTL_Translate8023To80211Header &pClientSTA->wSTADesc.vBSSIDforIBSS , VOS_MAC_ADDR_SIZE); VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - ("TL:TDLS CASE NOW ---------staid=%d\n"), ucStaId); + ("TL:TDLS CASE NOW ---------staid=%d"), ucStaId); break; #endif case WLAN_STA_INFRA: @@ -9420,7 +9420,7 @@ WLANTL_Translate8023To80211Header &pClientSTA->wSTADesc.vSTAMACAddress); vos_mem_copy( pw80211Header->vA3, w8023Header.vDA , VOS_MAC_ADDR_SIZE); TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "REGULAR INFRA LINK CASE---------staid=%d\n", + "REGULAR INFRA LINK CASE---------staid=%d", ucStaId)); break; } @@ -9569,7 +9569,7 @@ WLANTL_Translate80211To8023Header vos_mem_copy( w8023Header.vDA, w80211Header.vA3, VOS_MAC_ADDR_SIZE); vos_mem_copy( w8023Header.vSA, w80211Header.vA2, VOS_MAC_ADDR_SIZE); TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - "WLAN TL SoftAP: 802 3 DA %08x SA %08x \n", + "WLAN TL SoftAP: 802 3 DA %08x SA %08x", w8023Header.vDA, w8023Header.vSA)); } else @@ -10265,7 +10265,7 @@ WLAN_TLAPGetNextTxIds }// AC loop TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, - " TL can't find one station to serve \n" )); + " TL can't find one station to serve" )); pTLCb->uCurServedAC = WLANTL_AC_BK; pTLCb->ucCurLeftWeight = 1; @@ -12192,7 +12192,7 @@ static VOS_STATUS WLANTL_GetEtherType_2 if(vos_be16_to_cpu(usEtherType) == 0x890d) { VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - ("TDLS frame llc %x \n"), vos_be16_to_cpu(usEtherType)) ; + ("TDLS frame llc %x"), vos_be16_to_cpu(usEtherType)) ; } VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH, diff --git a/CORE/TL/src/wlan_qct_tl_ba.c b/CORE/TL/src/wlan_qct_tl_ba.c index 1bc4422c4ae7..bfff518156cb 100644 --- a/CORE/TL/src/wlan_qct_tl_ba.c +++ b/CORE/TL/src/wlan_qct_tl_ba.c @@ -236,15 +236,15 @@ v_VOID_t WLANTL_ReorderingAgingTimerExpierCB /*A replay packet found*/ VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLANTL_ReorderingAgingTimerExpierCB: total dropped replay packets on STA ID %X is [0x%X]\n", + "WLANTL_ReorderingAgingTimerExpierCB: total dropped replay packets on STA ID %X is [0x%X]", ucSTAID, pClientSTA->ulTotalReplayPacketsDetected); VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLANTL_ReorderingAgingTimerExpierCB: replay packet found with PN : [0x%llX]\n", + "WLANTL_ReorderingAgingTimerExpierCB: replay packet found with PN : [0x%llX]", ullcurrentReplayCounter); VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "WLANTL_ReorderingAgingTimerExpierCB: Drop the replay packet with PN : [0x%llX]\n", + "WLANTL_ReorderingAgingTimerExpierCB: Drop the replay packet with PN : [0x%llX]", ullcurrentReplayCounter); ReorderInfo->reorderBuffer->arrayBuffer[ucloopCounter] = NULL; @@ -516,7 +516,7 @@ WLANTL_BaSessionAdd if( WLANTL_MAX_BA_SESSION == idx) { VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "Number of Add BA request received more than allowed \n"); + "Number of Add BA request received more than allowed"); return VOS_STATUS_E_NOSUPPORT; } } @@ -703,7 +703,7 @@ WLANTL_BaSessionDel if(!VOS_IS_STATUS_SUCCESS(lockStatus)) { TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "Unable to acquire reorder vos lock in %s\n", __func__)); + "Unable to acquire reorder vos lock in %s", __func__)); return lockStatus; } pClientSTA->atlBAReorderInfo[ucTid].ucExists = 0; @@ -790,7 +790,7 @@ WLANTL_BaSessionDel if( lockRetryCnt > 2) { TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR, - "Unable to destroy reorderLock\n")); + "Unable to destroy reorderLock")); break; } vos_sleep(1); @@ -1255,7 +1255,7 @@ VOS_STATUS WLANTL_MSDUReorder if(NULL == vosPktIdx) { - TLLOG4(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,"Nothing to chain, just send current frame\n")); + TLLOG4(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_LOW,"Nothing to chain, just send current frame")); } else { @@ -1684,7 +1684,7 @@ VOS_STATUS WLANTL_QueueCurrent *vosDataBuff)); if(NULL != pwBaReorder->reorderBuffer->arrayBuffer[ucSlotIndex]) { - TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,"One Cycle rounded, lost many frames already, not in Q %d\n", + TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,"One Cycle rounded, lost many frames already, not in Q %d", pwBaReorder->pendingFramesCount)); return VOS_STATUS_E_RESOURCES; } @@ -1797,7 +1797,7 @@ VOS_STATUS WLANTL_ChainFrontPkts negDetect--; if(negDetect < 0) { - TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,"This is not possible, some balance has problem\n")); + TLLOGE(VOS_TRACE(VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,"This is not possible, some balance has problem")); VOS_ASSERT(0); return VOS_STATUS_E_FAULT; } diff --git a/CORE/TL/src/wlan_qct_tl_hosupport.c b/CORE/TL/src/wlan_qct_tl_hosupport.c index 199599b51eea..2f5058709500 100644 --- a/CORE/TL/src/wlan_qct_tl_hosupport.c +++ b/CORE/TL/src/wlan_qct_tl_hosupport.c @@ -607,7 +607,7 @@ VOS_STATUS WLANTL_StatHandleRXFrame tlCtxt->atlSTAClients[STAid]->trafficStatistics.pktCounterRssi[(v_U16_t)((WDA_GET_RX_RSSI_DB(pBDHeader)) * (-1))]++; #endif TLLOG1(VOS_TRACE (VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_MED, - "****Received rate Index = %d type=%d subtype=%d****\n", + "****Received rate Index = %d type=%d subtype=%d****", statistics->rxRate,WDA_GET_RX_TYPE(pBDHeader),WDA_GET_RX_SUBTYPE(pBDHeader))); statistics->rxBcnt += (packetSize - WLANHAL_RX_BD_HEADER_SIZE); diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c index 0d8ef0da8b56..99173e7ae503 100644 --- a/CORE/VOSS/src/vos_api.c +++ b/CORE/VOSS/src/vos_api.c @@ -690,7 +690,7 @@ VOS_STATUS vos_preStart( v_CONTEXT_t vosContext ) if ( vStatus == VOS_STATUS_E_TIMEOUT ) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Timeout occurred before WDA complete\n", __func__); + "%s: Timeout occurred before WDA complete", __func__); } else { @@ -2455,7 +2455,7 @@ v_VOID_t vos_fwDumpReq(tANI_U32 cmd, tANI_U32 arg1, tANI_U32 arg2, if (vStatus == VOS_STATUS_E_TIMEOUT) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Timeout occurred before WDA HAL DUMP complete\n", __func__); + "%s: Timeout occurred before WDA HAL DUMP complete", __func__); } else { diff --git a/CORE/VOSS/src/vos_diag.c b/CORE/VOSS/src/vos_diag.c index c2bec9b95266..cf0973ec8129 100644 --- a/CORE/VOSS/src/vos_diag.c +++ b/CORE/VOSS/src/vos_diag.c @@ -154,7 +154,7 @@ void vos_log_submit(v_VOID_t *plog_hdr_ptr) if(!pBuf) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "vos_mem_malloc failed\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "vos_mem_malloc failed"); return; } @@ -178,7 +178,7 @@ void vos_log_submit(v_VOID_t *plog_hdr_ptr) { if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pHddCtx->ptt_pid) < 0) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("Ptt Socket error sending message to the app!!\n")); + ("Ptt Socket error sending message to the app!!")); vos_mem_free((v_VOID_t *)wmsg); return; } @@ -235,7 +235,7 @@ void vos_event_report_payload(v_U16_t event_Id, v_U16_t length, v_VOID_t *pPaylo if(!pBuf) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "vos_mem_malloc failed\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, "vos_mem_malloc failed"); return; } wmsg = (tAniHdr*)pBuf; @@ -255,7 +255,7 @@ void vos_event_report_payload(v_U16_t event_Id, v_U16_t length, v_VOID_t *pPaylo if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pHddCtx->ptt_pid) < 0) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("Ptt Socket error sending message to the app!!\n")); + ("Ptt Socket error sending message to the app!!")); vos_mem_free((v_VOID_t*)wmsg); return; } diff --git a/CORE/VOSS/src/vos_getBin.c b/CORE/VOSS/src/vos_getBin.c index e0ebbf85fd30..2e7c05ce1329 100644 --- a/CORE/VOSS/src/vos_getBin.c +++ b/CORE/VOSS/src/vos_getBin.c @@ -107,7 +107,7 @@ VOS_STATUS vos_get_binary_blob( VOS_BINARY_ID binaryId, if ( !VOS_IS_STATUS_SUCCESS( VosSts )) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s : vos_open failed\n",__func__); + "%s : vos_open failed",__func__); return VOS_STATUS_E_FAILURE; } diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c index 5f2f8319d4af..00fb555922b9 100644 --- a/CORE/VOSS/src/vos_memory.c +++ b/CORE/VOSS/src/vos_memory.c @@ -215,7 +215,7 @@ v_VOID_t * vos_mem_malloc_debug( v_SIZE_t size, char* fileName, v_U32_t lineNum) if(VOS_STATUS_SUCCESS != vosStatus) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus); + "%s: Unable to insert node into List vosStatus %d", __func__, vosStatus); } memPtr = (v_VOID_t*)(memStruct + 1); @@ -469,7 +469,7 @@ v_VOID_t * vos_mem_dma_malloc_debug( v_SIZE_t size, char* fileName, v_U32_t line if(VOS_STATUS_SUCCESS != vosStatus) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus); + "%s: Unable to insert node into List vosStatus %d", __func__, vosStatus); } memPtr = (v_VOID_t*)(memStruct + 1); diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 157d4c82368c..a0a0d072be99 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -1186,7 +1186,7 @@ VOS_STATUS vos_nv_open(void) } VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "INFO: NV binary file version=%d Driver default NV version=%d, continue...\n", + "INFO: NV binary file version=%d Driver default NV version=%d, continue...", gnvEFSTable->halnv.fields.nvVersion, WLAN_NV_VERSION); /* Copying the read nv data to the globa NV EFS table */ @@ -1221,13 +1221,13 @@ VOS_STATUS vos_nv_open(void) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "!!!WARNING: Using Coupler Type field instead of Fw Config table,\n" - "Make sure that this is intented or may impact performance!!!\n"); + "Make sure that this is intended or may impact performance!!!"); } else { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, "!!!WARNING: NV binary file version doesn't match with Driver default NV version\n" - "Driver NV defaults will be used, may impact performance!!!\n"); + "Driver NV defaults will be used, may impact performance!!!"); return VOS_STATUS_SUCCESS; } @@ -1416,7 +1416,7 @@ VOS_STATUS vos_nv_close(void) if ( !VOS_IS_STATUS_SUCCESS( status )) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s : vos_open failed\n",__func__); + "%s : vos_open failed",__func__); return VOS_STATUS_E_FAILURE; } vos_mem_free(pnvEFSTable); @@ -1454,7 +1454,7 @@ VOS_STATUS vos_nv_getSupportedCountryCode( v_BYTE_t *pBuffer, v_SIZE_t *pBufferS if ( NULL == pBuffer || providedBufferSize < *pBufferSize ) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, - ("Insufficient memory for country code list\n")); + ("Insufficient memory for country code list")); return VOS_STATUS_E_NOMEM; } for (i = 0; i < countryInfoTable.countryCount; i++) @@ -1522,9 +1522,9 @@ VOS_STATUS vos_nv_readMacAddress( v_MAC_ADDRESS_t pMacAddress ) //This part of the code can be removed when NV is programmed const v_U8_t macAddr[VOS_MAC_ADDRESS_LEN] = VOS_HARD_CODED_MAC; memcpy( pMacAddress, macAddr, VOS_MAC_ADDRESS_LEN ); - VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN, - " fail to get MAC address from NV, hardcoded to %02X-%02X-%02X-%02X-%02X%02X", - macAddr[0], macAddr[1], macAddr[2], macAddr[3], macAddr[4], macAddr[5]); + VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN, + "fail to get MAC address from NV, hardcoded to "MAC_ADDRESS_STR, + MAC_ADDR_ARRAY(macAddr)); status = VOS_STATUS_SUCCESS; } return status; @@ -1626,7 +1626,7 @@ VOS_STATUS vos_nv_setValidity( VNV_TYPE type, v_BOOL_t itemIsValid ) gnvEFSTable->nvValidityBitmap = newNvValidityBitmap; status = wlan_write_to_efs((v_U8_t*)gnvEFSTable,sizeof(nvEFSTable_t)); if (! VOS_IS_STATUS_SUCCESS(status)) { - VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, ("vos_nv_write_to_efs failed!!!\r\n")); + VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, ("vos_nv_write_to_efs failed!!!")); status = VOS_STATUS_E_FAULT; } } @@ -1697,13 +1697,13 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, if (NULL == outputVoidBuffer) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("Buffer provided is NULL\r\n") ); + ("Buffer provided is NULL") ); return VOS_STATUS_E_FAULT; } if (0 == bufferSize) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("NV type=%d is invalid\r\n"), type ); + ("NV type=%d is invalid"), type ); return VOS_STATUS_E_INVAL; } // check if the NV item has valid data @@ -1711,7 +1711,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, if (!itemIsValid) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN, - "NV type=%d does not have valid data\r\n", type ); + "NV type=%d does not have valid data", type ); return VOS_STATUS_E_EMPTY; } switch(type) @@ -1720,7 +1720,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.fields); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1732,7 +1732,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.pwrOptimum); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1744,7 +1744,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.regDomains); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1756,7 +1756,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.defaultCountryTable); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1768,7 +1768,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.plutCharacterized); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1780,7 +1780,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.plutPdadcOffset); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1795,7 +1795,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1810,7 +1810,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1825,7 +1825,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1837,7 +1837,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.antennaPathLoss); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1849,7 +1849,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.pktTypePwrLimits); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1861,7 +1861,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.ofdmCmdPwrOffset); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1873,7 +1873,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.txbbFilterMode); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1887,7 +1887,7 @@ VOS_STATUS vos_nv_read( VNV_TYPE type, v_VOID_t *outputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.pwrOptimum_virtualRate); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1932,13 +1932,13 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, if (NULL == inputVoidBuffer) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("Buffer provided is NULL\r\n") ); + ("Buffer provided is NULL") ); return VOS_STATUS_E_FAULT; } if (0 == bufferSize) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("NV type=%d is invalid\r\n"), type ); + ("NV type=%d is invalid"), type ); return VOS_STATUS_E_INVAL; } switch(type) @@ -1947,7 +1947,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.fields); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1959,7 +1959,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.pwrOptimum); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1971,7 +1971,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.regDomains); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1983,7 +1983,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.defaultCountryTable); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -1995,7 +1995,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.plutCharacterized); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2007,7 +2007,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.plutPdadcOffset); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2022,7 +2022,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2037,7 +2037,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2052,7 +2052,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2064,7 +2064,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.antennaPathLoss); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2077,7 +2077,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.pktTypePwrLimits); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2090,7 +2090,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.ofdmCmdPwrOffset); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2103,7 +2103,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.txbbFilterMode); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2117,7 +2117,7 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, itemSize = sizeof(gnvEFSTable->halnv.tables.pwrOptimum_virtualRate); if(bufferSize != itemSize) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize, + ("type = %d buffer size=%d is less than data size=%d"),type, bufferSize, itemSize); status = VOS_STATUS_E_INVAL; } @@ -2134,13 +2134,13 @@ VOS_STATUS vos_nv_write( VNV_TYPE type, v_VOID_t *inputVoidBuffer, // set NV item to have valid data status = vos_nv_setValidity( type, VOS_TRUE ); if (! VOS_IS_STATUS_SUCCESS(status)) { - VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, ("vos_nv_setValidity failed!!!\r\n")); + VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, ("vos_nv_setValidity failed!!!")); status = VOS_STATUS_E_FAULT; } status = wlan_write_to_efs((v_U8_t*)gnvEFSTable,sizeof(nvEFSTable_t)); if (! VOS_IS_STATUS_SUCCESS(status)) { - VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, ("vos_nv_write_to_efs failed!!!\r\n")); + VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, ("vos_nv_write_to_efs failed!!!")); status = VOS_STATUS_E_FAULT; } } @@ -3120,7 +3120,7 @@ static int create_linux_regulatory_entry(struct wiphy *wiphy, /* 20MHz channels */ if (nBandCapability == eCSR_BAND_24) VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, - "BandCapability is set to 2G only\n"); + "BandCapability is set to 2G only"); for (i = 0, m = 0; i<IEEE80211_NUM_BANDS; i++) { @@ -3136,7 +3136,7 @@ static int create_linux_regulatory_entry(struct wiphy *wiphy, { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "error: wiphy->bands is NULL, i = %d\n", i); + "error: wiphy->bands is NULL, i = %d", i); continue; } @@ -3192,7 +3192,7 @@ static int create_linux_regulatory_entry(struct wiphy *wiphy, if (pnvEFSTable == NULL) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "error: pnvEFSTable is NULL, probably not parsed nv.bin yet\n"); + "error: pnvEFSTable is NULL, probably not parsed nv.bin yet"); return -1; } pnvEFSTable->halnv.tables.regDomains[temp_reg_domain].channels[k].enabled = @@ -3645,7 +3645,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, if (NULL == pRegDomain) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("Invalid reg domain pointer\n") ); + ("Invalid reg domain pointer") ); return VOS_STATUS_E_FAULT; } *pRegDomain = REGDOMAIN_COUNT; @@ -3653,13 +3653,13 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, if (NULL == countryCode) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("Country code array is NULL\r\n") ); + ("Country code array is NULL") ); return VOS_STATUS_E_FAULT; } if (0 == countryInfoTable.countryCount) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("Reg domain table is empty\r\n") ); + ("Reg domain table is empty") ); return VOS_STATUS_E_EMPTY; } /* If CRDA regulatory settings is valid, i.e. crda is enabled @@ -3668,7 +3668,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, entry if country code is crda's country. last one NUM_REG_DOMAINS-1 is reserved for crda */ VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH, - "vos_nv_getRegDomainFromCountryCode %c%c\n", + "vos_nv_getRegDomainFromCountryCode %c%c", countryCode[0], countryCode[1]); if (crda_regulatory_entry_valid == VOS_TRUE) @@ -3677,7 +3677,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, { *pRegDomain = NUM_REG_DOMAINS-1; VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH, - "vos_nv_getRegDomainFromCountryCode return crda init entry\n"); + "vos_nv_getRegDomainFromCountryCode return crda init entry"); return VOS_STATUS_SUCCESS; } if (run_time_alpha2[0]==countryCode[0] && @@ -3686,7 +3686,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, { *pRegDomain = NUM_REG_DOMAINS-2; VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH, - "vos_nv_getRegDomainFromCountryCode return crda none-default country entry\n"); + "vos_nv_getRegDomainFromCountryCode return crda none-default country entry"); return VOS_STATUS_SUCCESS; } else @@ -3700,7 +3700,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, if (NULL == pHddCtx) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - ("Invalid pHddCtx pointer\r\n") ); + ("Invalid pHddCtx pointer") ); return VOS_STATUS_E_FAULT; } @@ -3720,11 +3720,11 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, if (crda_regulatory_run_time_entry_valid == VOS_TRUE) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH, - "vos_nv_getRegDomainFromCountryCode return crda new none-default country entry\n"); + "vos_nv_getRegDomainFromCountryCode return crda new none-default country entry"); return VOS_STATUS_SUCCESS; } VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "vos_nv_getRegDomainFromCountryCode failed to get crda new none-default country entry\n"); + "vos_nv_getRegDomainFromCountryCode failed to get crda new none-default country entry"); return VOS_STATUS_E_EXISTS; } } @@ -3748,7 +3748,7 @@ VOS_STATUS vos_nv_getRegDomainFromCountryCode( v_REGDOMAIN_t *pRegDomain, else { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_WARN, - ("country code is not found\r\n")); + ("country code is not found")); return VOS_STATUS_E_EXISTS; } } diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c index 9c32f7526288..15ebb26f8ffb 100644 --- a/CORE/VOSS/src/vos_sched.c +++ b/CORE/VOSS/src/vos_sched.c @@ -291,7 +291,7 @@ vos_sched_open } wake_up_process(pSchedContext->TxThread); VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH, - ("VOSS TX thread Created\n")); + ("VOSS TX thread Created")); pSchedContext->RxThread = kthread_create(VosRXThread, pSchedContext, "VosRXThread"); @@ -305,7 +305,7 @@ vos_sched_open } wake_up_process(pSchedContext->RxThread); VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO_HIGH, - ("VOSS RX thread Created\n")); + ("VOSS RX thread Created")); #ifdef QCA_CONFIG_SMP pSchedContext->TlshimRxThread = kthread_create(VosTlshimRxThread, @@ -1595,7 +1595,7 @@ VOS_STATUS vos_sched_close ( v_PVOID_t pVosContext ) if (gpVosSchedContext == NULL) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: gpVosSchedContext == NULL\n",__func__); + "%s: gpVosSchedContext == NULL",__func__); return VOS_STATUS_E_FAILURE; } @@ -1652,7 +1652,7 @@ VOS_STATUS vos_watchdog_close ( v_PVOID_t pVosContext ) if (gpVosWatchdogContext == NULL) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: gpVosWatchdogContext is NULL\n",__func__); + "%s: gpVosWatchdogContext is NULL",__func__); return VOS_STATUS_E_FAILURE; } set_bit(WD_SHUTDOWN_EVENT_MASK, &gpVosWatchdogContext->wdEventFlag); @@ -1898,7 +1898,7 @@ void vos_sched_flush_mc_mqs ( pVosSchedContext pSchedContext ) */ VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_INFO, - ("Flushing the MC Thread message queue\n") ); + ("Flushing the MC Thread message queue") ); if (NULL == pSchedContext) { diff --git a/CORE/VOSS/src/vos_timer.c b/CORE/VOSS/src/vos_timer.c index 41670de41329..cbcab5e042e1 100644 --- a/CORE/VOSS/src/vos_timer.c +++ b/CORE/VOSS/src/vos_timer.c @@ -431,7 +431,7 @@ VOS_STATUS vos_timer_init_debug( vos_timer_t *timer, VOS_TIMER_TYPE timerType, if(VOS_STATUS_SUCCESS != vosStatus) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List vosStatus %d\n", __func__, vosStatus); + "%s: Unable to insert node into List vosStatus %d", __func__, vosStatus); } // set the various members of the timer structure diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c index 82a54c368f39..c8ef0a9a757f 100644 --- a/CORE/WDA/src/wlan_qct_wda.c +++ b/CORE/WDA/src/wlan_qct_wda.c @@ -255,7 +255,7 @@ VOS_STATUS WDA_open(v_PVOID_t pVosContext, v_PVOID_t pOSContext, if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "WDI Sync Event init failed - status = %d\n", status); + "WDI Sync Event init failed - status = %d", status); goto error; } /* Init Frame transfer event */ @@ -263,21 +263,21 @@ VOS_STATUS WDA_open(v_PVOID_t pVosContext, v_PVOID_t pOSContext, if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Mgmt Frame Event init failed - status = %d\n", status); + "VOS Mgmt Frame Event init failed - status = %d", status); goto error; } status = vos_event_init(&wdaContext->suspendDataTxEvent); if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS suspend data tx Event init failed - status = %d\n", status); + "VOS suspend data tx Event init failed - status = %d", status); goto error; } status = vos_event_init(&wdaContext->waitOnWdiIndicationCallBack); if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS wait On Wdi Ind Event init failed - status = %d\n", status); + "VOS wait On Wdi Ind Event init failed - status = %d", status); goto error; } vos_trace_setLevel(VOS_MODULE_ID_WDA,VOS_TRACE_LEVEL_ERROR); @@ -1884,7 +1884,7 @@ VOS_STATUS WDA_close(v_PVOID_t pVosContext) if(!VOS_IS_STATUS_SUCCESS(vstatus)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "WDI Sync Event destroy failed - status = %d\n", status); + "WDI Sync Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } @@ -1892,21 +1892,21 @@ VOS_STATUS WDA_close(v_PVOID_t pVosContext) if(!VOS_IS_STATUS_SUCCESS(vstatus)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event destroy failed - status = %d\n", status); + "VOS Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } vstatus = vos_event_destroy(&wdaContext->suspendDataTxEvent); if(!VOS_IS_STATUS_SUCCESS(vstatus)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event destroy failed - status = %d\n", status); + "VOS Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } vstatus = vos_event_destroy(&wdaContext->waitOnWdiIndicationCallBack); if(!VOS_IS_STATUS_SUCCESS(vstatus)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event destroy failed - status = %d\n", status); + "VOS Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } /* free WDA context */ @@ -2186,14 +2186,14 @@ VOS_STATUS WDA_SuspendDataTxCallback( v_PVOID_t pvosGCtx, if(!VOS_IS_STATUS_SUCCESS(vosStatus)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "NEW VOS Event Set failed - status = %d \n", vosStatus); + "NEW VOS Event Set failed - status = %d", vosStatus); } /* If TL suspended had timedout before this callback was called, resume back * TL.*/ if (pWDA->txSuspendTimedOut) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "Late TLSuspendCallback, resuming TL back again\n"); + "Late TLSuspendCallback, resuming TL back again"); WDA_ResumeDataTx(pWDA); pWDA->txSuspendTimedOut = FALSE; } @@ -2214,7 +2214,7 @@ VOS_STATUS WDA_SuspendDataTx(tWDA_CbContext *pWDA) if (pWDA->txSuspendTimedOut) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "TL suspend timedout previously, CB not called yet\n"); + "TL suspend timedout previously, CB not called yet"); return status; } /* Reset the event to be not signalled */ @@ -2222,7 +2222,7 @@ VOS_STATUS WDA_SuspendDataTx(tWDA_CbContext *pWDA) if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event reset failed - status = %d\n",status); + "VOS Event reset failed - status = %d",status); return VOS_STATUS_E_FAILURE; } /*Indicate TL to suspend transmission for all Sta Id */ @@ -4141,7 +4141,7 @@ static inline v_U8_t WDA_ConvertWniCfgIdToHALCfgId(v_U32_t wniCfgId) default: { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "There is no HAL CFG Id corresponding to WNI CFG Id: %d\n", + "There is no HAL CFG Id corresponding to WNI CFG Id: %d", wniCfgId); return VOS_STATUS_E_INVAL; } @@ -4165,7 +4165,7 @@ void WDA_UpdateCfgCallback(WDI_Status wdiStatus, void* pUserData) if(WDI_STATUS_SUCCESS != wdiStatus) { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "%s: CFG (%d) config failure \n", __func__, + "%s: CFG (%d) config failure", __func__, ((tHalCfg *)(wdiCfgParam->pConfigBuffer))->type); } @@ -4222,7 +4222,7 @@ VOS_STATUS WDA_UpdateCfg(tWDA_CbContext *pWDA, tSirMsgQ *cfgParam) if(NULL == wdiCfgReqParam->pConfigBuffer) { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "%s: VOS MEM Alloc Failure \n", __func__); + "%s: VOS MEM Alloc Failure", __func__); vos_mem_free(wdiCfgReqParam); VOS_ASSERT(0); return VOS_STATUS_E_NOMEM; @@ -4237,7 +4237,7 @@ VOS_STATUS WDA_UpdateCfg(tWDA_CbContext *pWDA, tSirMsgQ *cfgParam) &val) != eSIR_SUCCESS) { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "Failed to cfg get id %d\n", cfgParam->bodyval); + "Failed to cfg get id %d", cfgParam->bodyval); vos_mem_free(wdiCfgReqParam->pConfigBuffer); vos_mem_free(wdiCfgReqParam); return eSIR_FAILURE; @@ -4304,7 +4304,7 @@ VOS_STATUS WDA_GetWepKeysFromCfg( tWDA_CbContext *pWDA, &val )) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "WEP Key index [%d] may not configured in CFG\n",i); + "WEP Key index [%d] may not configured in CFG",i); } else { @@ -5600,7 +5600,7 @@ VOS_STATUS WDA_ProcessAddBASessionReq(tWDA_CbContext *pWDA, ((WLANTL_STA_CONNECTED != tlSTAState) && (WLANTL_STA_AUTHENTICATED != tlSTAState))) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "Peer staIdx %d hasn't established yet(%d). Send ADD BA failure to PE.\n", pAddBAReqParams->staIdx, tlSTAState ); + "Peer staIdx %d hasn't established yet(%d). Send ADD BA failure to PE.", pAddBAReqParams->staIdx, tlSTAState ); status = WDI_STATUS_E_NOT_ALLOWED; pAddBAReqParams->status = CONVERT_WDI2SIR_STATUS(status) ; @@ -5618,9 +5618,9 @@ VOS_STATUS WDA_ProcessAddBASessionReq(tWDA_CbContext *pWDA, if(IS_WDI_STATUS_FAILURE(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "Failure in ADD BA Session REQ Params WDI API, free all the memory =%d\n", status); + "Failure in ADD BA Session REQ Params WDI API, free all the memory =%d", status); VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "Send ADD BA failure response to PE\n"); + "Send ADD BA failure response to PE"); pAddBAReqParams->status = CONVERT_WDI2SIR_STATUS(status) ; WDA_SendMsg(pWDA, WDA_ADDBA_RSP, (void *)pAddBAReqParams , 0) ; @@ -7684,7 +7684,7 @@ VOS_STATUS WDA_ProcessSetPwrSaveCfgReq(tWDA_CbContext *pWDA, if(NULL == configParam) { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "%s: VOS MEM Alloc Failure \n", __func__); + "%s: VOS MEM Alloc Failure", __func__); VOS_ASSERT(0); vos_mem_free(pWdaParams); vos_mem_free(wdiPowerSaveCfg); @@ -8047,7 +8047,7 @@ void WDA_ConfigureRxpFilterRespCallback(WDI_Status wdiStatus, void* pUserData) if(WDI_STATUS_SUCCESS != wdiStatus) { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "%s: RXP config filter failure \n", __func__ ); + "%s: RXP config filter failure", __func__ ); } if(NULL == pWdaParams) { @@ -8246,7 +8246,7 @@ void WDA_ProcessWlanResumeCallback( if(WDI_STATUS_SUCCESS != resumeRspParams->wdiStatus) { VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "%s: Process Wlan Resume failure \n", __func__ ); + "%s: Process Wlan Resume failure", __func__ ); } vos_mem_free(pWdaParams->wdaWdiApiMsgParam) ; vos_mem_free(pWdaParams->wdaMsgParam); @@ -10517,12 +10517,12 @@ VOS_STATUS WDA_HALDumpCmdReq(tpAniSirGlobal pMac, tANI_U32 cmd, if ( vStatus == VOS_STATUS_E_TIMEOUT ) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Timeout occurred before WDA_HALDUMP complete\n",__func__); + "%s: Timeout occurred before WDA_HALDUMP complete",__func__); } else { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: WDA_HALDUMP reporting other error \n",__func__); + "%s: WDA_HALDUMP reporting other error",__func__); } VOS_ASSERT(0); } @@ -11030,7 +11030,7 @@ VOS_STATUS WDA_TxComplete( v_PVOID_t pVosContext, vos_pkt_t *pData, if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "NEW VOS Event Set failed - status = %d \n", status); + "NEW VOS Event Set failed - status = %d", status); } return status; } @@ -11067,7 +11067,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle, } VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO_HIGH, - "Tx Mgmt Frame Subtype: %d alloc(%p)\n", pFc->subType, pFrmBuf); + "Tx Mgmt Frame Subtype: %d alloc(%p)", pFc->subType, pFrmBuf); pMac = (tpAniSirGlobal )VOS_GET_MAC_CTXT(pWDA->pVosContext); if(NULL == pMac) { @@ -11088,7 +11088,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle, { /* Already TxComp is active no need to active again */ VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "There is already one request pending for tx complete\n"); + "There is already one request pending for tx complete"); pWDA->pAckTxCbFunc( pMac, 0); pWDA->pAckTxCbFunc = NULL; @@ -11121,7 +11121,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle, if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event reset failed - status = %d\n",status); + "VOS Event reset failed - status = %d",status); pCompFunc(pWDA->pVosContext, (vos_pkt_t *)pFrmBuf, 1); if( pAckTxComp ) { @@ -11191,7 +11191,7 @@ VOS_STATUS WDA_TxPacket(void *pWDA_handle, WDA_TxComplete, NULL, txFlag)) != VOS_STATUS_SUCCESS) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "Sending Mgmt Frame failed - status = %d\n", status); + "Sending Mgmt Frame failed - status = %d", status); pCompFunc(VOS_GET_MAC_CTXT(pWDA->pVosContext), (vos_pkt_t *)pFrmBuf, 1); vos_atomic_set_U32(&pWDA->VosPacketToFree, (v_U32_t)WDA_TX_PACKET_FREED);/*reset the VosPacket_freed*/ if( pAckTxComp ) @@ -11941,11 +11941,11 @@ VOS_STATUS WDA_McProcessMsg( v_CONTEXT_t pVosContext, vos_msg_t *pMsg ) WDA_ProcessUpdateOpMode(pWDA, (tUpdateVHTOpMode *)pMsg->bodyptr); else VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - " VHT OpMode Feature is Not Supported \n"); + " VHT OpMode Feature is Not Supported"); } else VOS_TRACE(VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - " 11AC Feature is Not Supported \n"); + " 11AC Feature is Not Supported"); break; } #endif @@ -13127,14 +13127,14 @@ void WDA_ProcessTxCompleteTimeOutInd(tWDA_CbContext* pWDA) if( pWDA->pAckTxCbFunc ) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "TxComplete timer expired\n"); + "TxComplete timer expired"); pWDA->pAckTxCbFunc( pMac, 0); pWDA->pAckTxCbFunc = NULL; } else { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "There is no request pending for TxComplete and wait timer expired\n"); + "There is no request pending for TxComplete and wait timer expired"); } } /* @@ -14139,19 +14139,19 @@ VOS_STATUS WDA_ProcessReceiveFilterSetFilterReq (tWDA_CbContext *pWDA, &pRcvPktFilterCfg->paramsData[i], sizeof(pwdiSetRcvPktFilterReqParamsType->wdiPktFilterCfg.paramsData[i])); VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, - "Proto %d Comp Flag %d \n", + "Proto %d Comp Flag %d", pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].protocolLayer, pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].cmpFlag); VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, - "Data Offset %d Data Len %d\n", + "Data Offset %d Data Len %d", pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].dataOffset, pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].dataLength); VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, - "CData: %d:%d:%d:%d:%d:%d\n", + "CData: %d:%d:%d:%d:%d:%d", pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].compareData[0], pwdiSetRcvPktFilterReqParamsType-> @@ -14165,7 +14165,7 @@ VOS_STATUS WDA_ProcessReceiveFilterSetFilterReq (tWDA_CbContext *pWDA, pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].compareData[5]); VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO, - "MData: %d:%d:%d:%d:%d:%d\n", + "MData: %d:%d:%d:%d:%d:%d", pwdiSetRcvPktFilterReqParamsType-> wdiPktFilterCfg.paramsData[i].dataMask[0], pwdiSetRcvPktFilterReqParamsType-> @@ -14753,21 +14753,21 @@ VOS_STATUS WDA_shutdown(v_PVOID_t pVosContext, wpt_boolean closeTransport) if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event destroy failed - status = %d\n", status); + "VOS Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } status = vos_event_destroy(&pWDA->suspendDataTxEvent); if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event destroy failed - status = %d\n", status); + "VOS Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } status = vos_event_destroy(&pWDA->waitOnWdiIndicationCallBack); if(!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR, - "VOS Event destroy failed - status = %d\n", status); + "VOS Event destroy failed - status = %d", status); status = VOS_STATUS_E_FAILURE; } /* free WDA context */ diff --git a/CORE/WDA/src/wlan_qct_wda_legacy.c b/CORE/WDA/src/wlan_qct_wda_legacy.c index 3b0127a1ed6b..3c9192873cbc 100644 --- a/CORE/WDA/src/wlan_qct_wda_legacy.c +++ b/CORE/WDA/src/wlan_qct_wda_legacy.c @@ -151,7 +151,7 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb) msg.type = pMb->type; msg.bodyval = 0; - WDALOG3(wdaLog(pMac, LOG3, FL("msgType %d, msgLen %d\n" ), + WDALOG3(wdaLog(pMac, LOG3, FL("msgType %d, msgLen %d" ), pMb->type, pMb->msgLen)); // copy the message from host buffer to firmware buffer @@ -163,7 +163,7 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb) pMbLocal = vos_mem_malloc(pMb->msgLen); if ( NULL == pMbLocal ) { - WDALOGE( wdaLog(pMac, LOGE, FL("Buffer Allocation failed!\n"))); + WDALOGE( wdaLog(pMac, LOGE, FL("Buffer Allocation failed!"))); return eSIR_FAILURE; } @@ -194,7 +194,7 @@ tSirRetStatus uMacPostCtrlMsg(void* pSirGlobal, tSirMbMsg* pMb) default: WDALOGW( wdaLog(pMac, LOGW, FL("Unknown message type = " - "0x%X\n"), + "0x%X"), msg.type)); // Release the memory. @@ -225,7 +225,7 @@ tBssSystemRole wdaGetGlobalSystemRole(tpAniSirGlobal pMac) VOS_ASSERT(0); return eSYSTEM_UNKNOWN_ROLE; } - WDALOG1( wdaLog(pMac, LOG1, FL(" returning %d role\n"), + WDALOG1( wdaLog(pMac, LOG1, FL(" returning %d role"), wdaContext->wdaGlobalSystemRole)); return wdaContext->wdaGlobalSystemRole; } @@ -36,15 +36,14 @@ ifeq ($(KERNEL_BUILD), 0) #Flag to enable Fast Transition (11r) feature CONFIG_QCOM_VOWIFI_11R := y - #Flag to enable Protected Managment Frames (11w) feature - ifneq ($(CONFIG_QCA_CLD_WLAN),) - ifeq ($(CONFIG_CNSS),y) - CONFIG_WLAN_FEATURE_11W := y - endif - endif - - #Flag to enable LTE CoEx feature - CONFIG_QCOM_LTE_COEX := y + ifneq ($(CONFIG_QCA_CLD_WLAN),) + ifeq ($(CONFIG_CNSS),y) + #Flag to enable Protected Managment Frames (11w) feature + CONFIG_WLAN_FEATURE_11W := y + #Flag to enable LTE CoEx feature + CONFIG_QCOM_LTE_COEX := y + endif + endif #Flag to enable new Linux Regulatory implementation CONFIG_ENABLE_LINUX_REG := y |