diff options
| author | Arif Hussain <c_arifh@qca.qualcomm.com> | 2014-03-28 16:20:33 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-08 09:32:44 -0700 |
| commit | 3ce75dcd8b19c2af603f2d3cf37cacdcf58fa11a (patch) | |
| tree | 31fb60b987bbb957f4a330bad9ce31e924dfcb72 | |
| parent | 2d4b53e2a7c5f64726e8432adf10759b9597024b (diff) | |
wlan: HDD: removing newlines from the debug logs
dmesg log is a limited and extremely precious
debugging tool. Any unnecessary prints are avoided.
Change-Id: I2cd68f11f6c9d9880b9000e178e5208919f1e6a6
CRs-Fixed: 640701
| -rw-r--r-- | CORE/HDD/src/bap_hdd_main.c | 90 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 36 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 198 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 152 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_early_suspend.c | 14 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_ftm.c | 110 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_hostapd.c | 46 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_ipa.c | 4 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 58 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_oemdata.c | 10 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_p2p.c | 25 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_scan.c | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_softap_tx_rx.c | 30 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_tdls.c | 6 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wext.c | 208 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wmm.c | 16 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_wowl.c | 10 |
17 files changed, 508 insertions, 507 deletions
diff --git a/CORE/HDD/src/bap_hdd_main.c b/CORE/HDD/src/bap_hdd_main.c index 9af213469ba7..995d2b54eec5 100644 --- a/CORE/HDD/src/bap_hdd_main.c +++ b/CORE/HDD/src/bap_hdd_main.c @@ -414,13 +414,13 @@ static VOS_STATUS WLANBAP_STAFetchPktCB WLANTL_MetaInfoType TlMetaInfo; pctx = &BslClientCtx[0]; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "WLANBAP_STAFetchPktCB\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "WLANBAP_STAFetchPktCB" ); // sanity checking if( pHddHdl == NULL || vosDataBuff == NULL || tlMetaInfo == NULL || ucAC >= WLANTL_MAX_AC || ucAC < 0 ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STAFetchPktCB bad input\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STAFetchPktCB bad input" ); return VOS_STATUS_E_FAILURE; } @@ -478,12 +478,12 @@ static VOS_STATUS WLANBAP_STAFetchPktCB if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STAFetchPktCB vos_pkt_wrap_data_packet " - "failed status =%d\n", VosStatus ); + "failed status =%d", VosStatus ); kfree_skb(skb); return VosStatus; } - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: pVosPkt(vos_pkt_t *)=%p\n", __func__, + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: pVosPkt(vos_pkt_t *)=%p", __func__, pVosPkt ); VosStatus = WLANBAP_XlateTxDataPkt( pctx->bapHdl, pPhyCtx->PhyLinkHdl, @@ -492,7 +492,7 @@ static VOS_STATUS WLANBAP_STAFetchPktCB if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STAFetchPktCB WLANBAP_XlateTxDataPkt " - "failed status =%d\n", VosStatus ); + "failed status =%d", VosStatus ); // return the packet VosStatus = vos_pkt_return_packet( pVosPkt ); @@ -507,7 +507,7 @@ static VOS_STATUS WLANBAP_STAFetchPktCB // provide the meta-info BAP provided previously *tlMetaInfo = TlMetaInfo; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: *vosDataBuff(vos_pkt_t *)=%p\n", __func__, *vosDataBuff ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "%s: *vosDataBuff(vos_pkt_t *)=%p", __func__, *vosDataBuff ); return(VOS_STATUS_SUCCESS); } // WLANBAP_STAFetchPktCB() @@ -543,12 +543,12 @@ static VOS_STATUS WLANBAP_STARxCB vos_pkt_t* pVosPacket; vos_pkt_t* pNextVosPacket; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "WLANBAP_STARxCB\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "WLANBAP_STARxCB" ); // sanity checking if ( pHddHdl == NULL || vosDataBuff == NULL || pRxMetaInfo == NULL ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STARxCB bad input\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STARxCB bad input" ); if(NULL != vosDataBuff) { VosStatus = vos_pkt_return_packet( vosDataBuff ); @@ -561,7 +561,7 @@ static VOS_STATUS WLANBAP_STARxCB if( NULL == ppctx ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STARxCB ClientCtx is NULL\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_STARxCB ClientCtx is NULL" ); VosStatus = vos_pkt_return_packet( vosDataBuff ); return VOS_STATUS_E_FAILURE; } @@ -588,7 +588,7 @@ static VOS_STATUS WLANBAP_STARxCB if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_FATAL, "WLANBAP_STARxCB WLANBAP_XlateRxDataPkt " - "failed status = %d\n", VosStatus ); + "failed status = %d", VosStatus ); VosStatus = VOS_STATUS_E_FAILURE; @@ -601,7 +601,7 @@ static VOS_STATUS WLANBAP_STARxCB if(!VOS_IS_STATUS_SUCCESS( VosStatus )) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: Failure extracting skb from vos pkt. " - "VosStatus = %d\n", __func__, VosStatus ); + "VosStatus = %d", __func__, VosStatus ); VosStatus = VOS_STATUS_E_FAILURE; @@ -664,7 +664,7 @@ static VOS_STATUS WLANBAP_TxCompCB BslClientCtxType* ppctx; static int num_packets; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "WLANBAP_TxCompCB. vosDataBuff(vos_pkt_t *)=%p\n", vosDataBuff ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "WLANBAP_TxCompCB. vosDataBuff(vos_pkt_t *)=%p", vosDataBuff ); // be aware that pHddHdl can be NULL or can point to the per association // BSL context from the register data plane. In either case it does not @@ -674,7 +674,7 @@ static VOS_STATUS WLANBAP_TxCompCB // sanity checking if ( vosDataBuff == NULL ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_TxCompCB bad input\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_TxCompCB bad input" ); return VOS_STATUS_E_FAILURE; } @@ -704,7 +704,7 @@ static VOS_STATUS WLANBAP_TxCompCB num_packets = (num_packets + 1) % 4; if (num_packets == 0 ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: Sending up number of completed packets. num_packets = %d.\n", __func__, num_packets ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO, "%s: Sending up number of completed packets. num_packets = %d.", __func__, num_packets ); WLANBAP_TxPacketMonitorHandler ( (v_PVOID_t) ppctx->bapHdl ); // our handle in BAP } @@ -772,7 +772,7 @@ static void BslReleasePhyCtx uintptr_t OldMapVal; VOS_STATUS VosStatus = VOS_STATUS_SUCCESS; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslReleasePhyCtx\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslReleasePhyCtx" ); pPhyCtx->used = FALSE; @@ -865,12 +865,12 @@ static VOS_STATUS WLANBAP_EventCB // sanity checking if ( pBapHCIEvent == NULL ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB bad input\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB bad input" ); return VOS_STATUS_E_FAILURE; } VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "WLANBAP_EventCB event=%d " - "assoc_specific=%d\n", pBapHCIEvent->bapHCIEventCode, AssocSpecificEvent ); + "assoc_specific=%d", pBapHCIEvent->bapHCIEventCode, AssocSpecificEvent ); if ( pHddHdl == NULL ) { @@ -888,7 +888,7 @@ static VOS_STATUS WLANBAP_EventCB } else { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_FATAL, "WLANBAP_EventCB bad input\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_FATAL, "WLANBAP_EventCB bad input" ); return VOS_STATUS_E_FAILURE; } } @@ -922,7 +922,7 @@ static VOS_STATUS WLANBAP_EventCB if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB vos_pkt_get_packet " - "failed status=%d\n", VosStatus ); + "failed status=%d", VosStatus ); return(VosStatus); } @@ -1206,7 +1206,7 @@ static VOS_STATUS WLANBAP_EventCB if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB WLANBAP_RegisterDataPlane " - "failed status = %d\n", VosStatus ); + "failed status = %d", VosStatus ); // we still want to send the event upto app so do not bail } else @@ -1269,7 +1269,7 @@ static VOS_STATUS WLANBAP_EventCB else { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB unexpected HCI Phy Link Comp Evt " - "status =%d\n", pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.status ); + "status =%d", pBapHCIEvent->u.btampPhysicalLinkCompleteEvent.status ); } break; @@ -1321,7 +1321,7 @@ static VOS_STATUS WLANBAP_EventCB else { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB unexpected HCI Dis Phy Link Comp Evt " - "status =%d reason =%d\n", pBapHCIEvent->u.btampDisconnectPhysicalLinkCompleteEvent.status, + "status =%d reason =%d", pBapHCIEvent->u.btampDisconnectPhysicalLinkCompleteEvent.status, pBapHCIEvent->u.btampDisconnectPhysicalLinkCompleteEvent.reason ); } @@ -1443,7 +1443,7 @@ static VOS_STATUS WLANBAP_EventCB } default: { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB unexpected event\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB unexpected event" ); VosStatus = vos_pkt_return_packet( pVosPkt ); @@ -1467,7 +1467,7 @@ static VOS_STATUS WLANBAP_EventCB if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_EventCB vos_pkt_push_head " - "status =%d\n", VosStatus ); + "status =%d", VosStatus ); // return the packet VosStatus = vos_pkt_return_packet( pVosPkt ); @@ -1482,7 +1482,7 @@ static VOS_STATUS WLANBAP_EventCB if(!VOS_IS_STATUS_SUCCESS( VosStatus )) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "%s: Failure extracting skb from vos pkt. " - "VosStatus = %d\n", __func__, VosStatus ); + "VosStatus = %d", __func__, VosStatus ); // return the packet VosStatus = vos_pkt_return_packet( pVosPkt ); @@ -1558,7 +1558,7 @@ static BOOL BslFindAndInitClientCtx BslClientCtxType* pctx; v_U8_t i; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslFindAndInitClientCtx\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslFindAndInitClientCtx" ); if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { @@ -1580,7 +1580,7 @@ static BOOL BslFindAndInitClientCtx { // no more clients can be supported VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "BslFindAndInitClientCtx no more " - "clients can be supported MAX=%d\n", BSL_MAX_CLIENTS ); + "clients can be supported MAX=%d", BSL_MAX_CLIENTS ); return FALSE; } @@ -1648,7 +1648,7 @@ static void BslReleaseClientCtx vos_list_node_t* pLink; BslPhyLinksNodeType *pPhyNode; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslReleaseClientCtx\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslReleaseClientCtx" ); // an app can do this without cleaning up after itself i.e. it can have active associations and // data pending, we need to cleanup its mess @@ -1737,7 +1737,7 @@ static BOOL BslFindAndInitPhyCtx vos_list_node_t* pLink; BslPhyLinksNodeType *pNode; - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslFindAndInitPhyCtx\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslFindAndInitPhyCtx" ); for ( i=0; i<BSL_MAX_PHY_LINKS; i++ ) { @@ -1784,7 +1784,7 @@ static BOOL BslFindAndInitPhyCtx { // this could happen due to pool not being big enough, etc VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslFindAndInitPhyCtx failed to " - "get node from BslPhyLinksDescPool vstatus=%d\n", VosStatus ); + "get node from BslPhyLinksDescPool vstatus=%d", VosStatus ); BslReleasePhyCtx( *ppPhyCtx ); return FALSE; } @@ -1853,10 +1853,10 @@ static BOOL BslProcessHCICommand cmdOpcode = ( cmdOpcode & 0xFF ) << 8 | ( cmdOpcode & 0xFF00 ) >> 8; } - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslProcessHCICommand: cmdOpcode = %hx\n", cmdOpcode ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslProcessHCICommand: cmdOpcode = %hx", cmdOpcode ); for(i=0; i<4; i++) - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslProcessHCICommand: *pBuf before advancepTmp[%x] = %x\n", i,pTmp[i] ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslProcessHCICommand: *pBuf before advancepTmp[%x] = %x", i,pTmp[i] ); pBuf+=CMD_TLV_TYPE_AND_LEN_SIZE; @@ -1894,7 +1894,7 @@ static BOOL BslProcessHCICommand Status = BslFindAndInitPhyCtx( pctx, CreatePhysicalLinkCmd.phy_link_handle, &pPhyCtx ); - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "CreatePhysicalLinkCmd.phy_link_handle=%d\n",CreatePhysicalLinkCmd.phy_link_handle); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "CreatePhysicalLinkCmd.phy_link_handle=%d",CreatePhysicalLinkCmd.phy_link_handle); if ( !Status ) { @@ -1962,7 +1962,7 @@ static BOOL BslProcessHCICommand Status = BslFindAndInitPhyCtx( pctx, AcceptPhysicalLinkCmd.phy_link_handle, &pPhyCtx ); - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "AcceptPhysicalLinkCmd.phy_link_handle=%d\n",AcceptPhysicalLinkCmd.phy_link_handle); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "AcceptPhysicalLinkCmd.phy_link_handle=%d",AcceptPhysicalLinkCmd.phy_link_handle); if ( !Status ) { @@ -2005,7 +2005,7 @@ static BOOL BslProcessHCICommand Count = Count - 3;//Type and length field lengths are not needed pTmp = pBuf; for(i=0; i<4; i++) - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslProcessHCICommand: *pBuf in Disconnect phy link pTmp[%x] = %x\n", i,pTmp[i] ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_HIGH, "BslProcessHCICommand: *pBuf in Disconnect phy link pTmp[%x] = %x", i,pTmp[i] ); // unpack UnpackStatus = btampUnpackTlvHCI_Disconnect_Physical_Link_Cmd( NULL, pBuf, Count, &DisconnectPhysicalLinkCmd ); @@ -3552,7 +3552,7 @@ static BOOL BslProcessACLDataTx static int num_packets; #endif - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslProcessACLDataTx\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_INFO_LOW, "BslProcessACLDataTx" ); // need to find the PHY link for this ACL data pkt based on phy_link_handle // TODO need some endian-ness check? @@ -3576,7 +3576,7 @@ static BOOL BslProcessACLDataTx if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "BslProcessACLDataTx WLANBAP_GetAcFromTxDataPkt " - "failed status =%d\n", VosStatus ); + "failed status =%d", VosStatus ); Ac = WLANTL_AC_BE; } @@ -3608,7 +3608,7 @@ static BOOL BslProcessACLDataTx if ( !VOS_IS_STATUS_SUCCESS( VosStatus ) ) { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "BslProcessACLDataTx WLANBAP_STAPktPending " - "failed status =%d\n", VosStatus ); + "failed status =%d", VosStatus ); VOS_ASSERT(0); } } @@ -3618,7 +3618,7 @@ static BOOL BslProcessACLDataTx else { VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "BslProcessACLDataTx attempting to send " - "data for a non-existant assocation\n" ); + "data for a non-existant assocation" ); return(FALSE); } @@ -3820,7 +3820,7 @@ int BSL_Init ( v_PVOID_t pvosGCtx ) if (err < 0) { VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, - "Unable to register HCI device, err=%d\n", err); + "Unable to register HCI device, err=%d", err); pctx->hdev = NULL; hci_free_dev(hdev); return -ENODEV; @@ -4349,7 +4349,7 @@ VOS_STATUS WLANBAP_SetConfig // sanity checking if ( pConfig == NULL ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_SetConfig bad input\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_SetConfig bad input" ); return VOS_STATUS_E_FAILURE; } pctx = gpBslctx; @@ -4364,7 +4364,7 @@ VOS_STATUS WLANBAP_SetConfig status = WLANBAP_GetNewHndl(&pctx->bapHdl); if ( !VOS_IS_STATUS_SUCCESS( status ) ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_SetConfig can't get BAP handle\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_SetConfig can't get BAP handle" ); return VOS_STATUS_E_FAILURE; } @@ -4372,7 +4372,7 @@ VOS_STATUS WLANBAP_SetConfig status = WLAN_BAPSetConfig(pctx->bapHdl, pConfig); if ( !VOS_IS_STATUS_SUCCESS( status ) ) { - VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_SetConfig can't set BAP config\n" ); + VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, "WLANBAP_SetConfig can't set BAP config" ); return VOS_STATUS_E_FAILURE; } @@ -4405,7 +4405,7 @@ VOS_STATUS WLANBAP_RegisterWithHCI(hdd_adapter_t *pAdapter) if(NULL != pctx->hdev) { VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_WARN, - "Already registered as HCI device\n"); + "Already registered as HCI device"); return VOS_STATUS_SUCCESS; } @@ -4478,7 +4478,7 @@ VOS_STATUS WLANBAP_RegisterWithHCI(hdd_adapter_t *pAdapter) if (err < 0) { VOS_TRACE(VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, - "Unable to register HCI device, err=%d\n", err); + "Unable to register HCI device, err=%d", err); pctx->hdev = NULL; hci_free_dev(hdev); return VOS_STATUS_E_FAULT; diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index e268ed05e542..48795e103f03 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -520,13 +520,13 @@ static void hdd_SendNewAPChannelInfo(struct net_device *dev, hdd_adapter_t *pAda if (descriptor == NULL) { hddLog(LOGE, - "%s: pCsrRoamInfo->pBssDesc=%p\n", + "%s: pCsrRoamInfo->pBssDesc=%p", __func__, descriptor); return; } // Send the Channel event, the supplicant needs this to generate the Adjacent AP report. - hddLog(LOGW, "%s: Sending up an SIOCGIWFREQ, channelId=%d\n", __func__, descriptor->channelId); + hddLog(LOGW, "%s: Sending up an SIOCGIWFREQ, channelId=%d", __func__, descriptor->channelId); memset(&wrqu, '\0', sizeof(wrqu)); wrqu.freq.m = descriptor->channelId; wrqu.freq.e = 0; @@ -1240,7 +1240,7 @@ static void hdd_SendReAssocEvent(struct net_device *dev, hdd_adapter_t *pAdapter //pFTAssocRsp needs to point to the IEs pFTAssocRsp += FT_ASSOC_RSP_IES_OFFSET; - hddLog(LOG1, "%s: AssocRsp is now at %02x%02x\n", __func__, + hddLog(LOG1, "%s: AssocRsp is now at %02x%02x", __func__, (unsigned int)pFTAssocRsp[0], (unsigned int)pFTAssocRsp[1]); @@ -1457,10 +1457,10 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs if(ft_carrier_on) { hddLog(LOG1, "%s ft_carrier_on is %d, sending roamed " - "indication\n", __FUNCTION__, ft_carrier_on); + "indication", __FUNCTION__, ft_carrier_on); chan = ieee80211_get_channel(pAdapter->wdev.wiphy, (int)pRoamInfo->pBssDesc->channelId); - hddLog(LOG1, "assocReqlen %d assocRsplen %d\n", assocReqlen, + hddLog(LOG1, "assocReqlen %d assocRsplen %d", assocReqlen, assocRsplen); cfg80211_roamed(dev,chan, pRoamInfo->bssid, pFTAssocReq, assocReqlen, pFTAssocRsp, assocRsplen, @@ -1484,7 +1484,7 @@ static eHalStatus hdd_AssociationCompletionHandler( hdd_adapter_t *pAdapter, tCs else { hddLog(LOG1, "%s ft_carrier_on is %d, sending connect " - "indication\n", __FUNCTION__, ft_carrier_on); + "indication", __FUNCTION__, ft_carrier_on); cfg80211_connect_result(dev, pRoamInfo->bssid, pFTAssocReq, assocReqlen, pFTAssocRsp, assocRsplen, @@ -2140,7 +2140,7 @@ static eHalStatus roamRoamConnectStatusUpdateHandler( hdd_adapter_t *pAdapter, t pRoamInfo->peerMac, WNI_CFG_BSSID_LEN); VOS_TRACE( VOS_MODULE_ID_HDD, - VOS_TRACE_LEVEL_INFO_HIGH, "New peer joined set PTK encType=%d\n", + VOS_TRACE_LEVEL_INFO_HIGH, "New peer joined set PTK encType=%d", pHddStaCtx->ibss_enc_key.encType); vosStatus = sme_RoamSetKey( WLAN_HDD_GET_HAL_CTX(pAdapter), @@ -2261,12 +2261,12 @@ VOS_STATUS hdd_roamRegisterTDLSSTA( hdd_adapter_t *pAdapter, : (staDesc.ucQosEnabled = 0) ; VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "HDD register \ - TL QoS_enabled=%d\n", staDesc.ucQosEnabled ); + TL QoS_enabled=%d", staDesc.ucQosEnabled ); staDesc.ucProtectedFrame = (connectedCipherAlgo != eCSR_ENCRYPT_TYPE_NONE) ; VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_MED, - "HDD register TL Sec_enabled= %d.\n", staDesc.ucProtectedFrame ); + "HDD register TL Sec_enabled= %d.", staDesc.ucProtectedFrame ); /* * UMA is ready we inform TL to do frame translation. @@ -2767,7 +2767,7 @@ eHalStatus hdd_smeRoamCallback( void *pContext, tCsrRoamInfo *pRoamInfo, tANI_U3 * in any case tell the OS, our carrier is off and mark * interface down */ case eCSR_ROAM_FT_REASSOC_FAILED: - hddLog(LOG1, FL("Reassoc Failed\n")); + hddLog(LOG1, FL("Reassoc Failed")); halStatus = hdd_DisConnectHandler( pAdapter, pRoamInfo, roamId, roamStatus, roamResult ); /* Check if Mcast/Bcast Filters are set, if yes clear the filters here */ if ((WLAN_HDD_GET_CTX(pAdapter))->hdd_mcastbcast_filter_set == TRUE) { @@ -3454,7 +3454,7 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) ENTER(); pRoamProfile->AuthType.numEntries = 1; - hddLog( LOG1, "%s: pHddStaCtx->conn_info.authType = %d\n", __func__, pHddStaCtx->conn_info.authType); + hddLog( LOG1, "%s: pHddStaCtx->conn_info.authType = %d", __func__, pHddStaCtx->conn_info.authType); switch( pHddStaCtx->conn_info.authType) { @@ -3473,11 +3473,11 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_WPA) && ((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X) == IW_AUTH_KEY_MGMT_802_1X)) { - hddLog( LOG1, "%s: set authType to CCKM WPA. AKM also 802.1X.\n", __func__); + hddLog( LOG1, "%s: set authType to CCKM WPA. AKM also 802.1X.", __func__); pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_WPA; } else if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_WPA)) { - hddLog( LOG1, "%s: Last chance to set authType to CCKM WPA.\n", __func__); + hddLog( LOG1, "%s: Last chance to set authType to CCKM WPA.", __func__); pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_WPA; } else #endif @@ -3497,11 +3497,11 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_RSN) && ((pWextState->authKeyMgmt & IW_AUTH_KEY_MGMT_802_1X) == IW_AUTH_KEY_MGMT_802_1X)) { - hddLog( LOG1, "%s: set authType to CCKM RSN. AKM also 802.1X.\n", __func__); + hddLog( LOG1, "%s: set authType to CCKM RSN. AKM also 802.1X.", __func__); pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_RSN; } else if ((RSNAuthType == eCSR_AUTH_TYPE_CCKM_RSN)) { - hddLog( LOG1, "%s: Last chance to set authType to CCKM RSN.\n", __func__); + hddLog( LOG1, "%s: Last chance to set authType to CCKM RSN.", __func__); pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_CCKM_RSN; } else #endif @@ -3545,7 +3545,7 @@ int hdd_set_csr_auth_type ( hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType) default: #ifdef FEATURE_WLAN_ESE - hddLog( LOG1, "%s: In default, unknown auth type.\n", __func__); + hddLog( LOG1, "%s: In default, unknown auth type.", __func__); #endif /* FEATURE_WLAN_ESE */ pRoamProfile->AuthType.authType[0] = eCSR_AUTH_TYPE_UNKNOWN; break; @@ -3926,8 +3926,8 @@ int iw_set_auth(struct net_device *dev,struct iw_request_info *info, #define IW_AUTH_KEY_MGMT_CCKM 8 /* Should be in linux/wireless.h */ /*Check for CCKM AKM type */ if ( wrqu->param.value & IW_AUTH_KEY_MGMT_CCKM) { - //hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"%s: CCKM AKM Set %d\n", __func__, wrqu->param.value); - hddLog(VOS_TRACE_LEVEL_INFO,"%s: CCKM AKM Set %d\n", __func__, wrqu->param.value); + hddLog(VOS_TRACE_LEVEL_INFO,"%s: CCKM AKM Set %d", + __func__, wrqu->param.value); /* Set the CCKM bit in authKeyMgmt */ /* Right now, this breaks all ref to authKeyMgmt because our * code doesn't realize it is a "bitfield" diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index e736d1fb1700..9e568594e935 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -3422,13 +3422,13 @@ VOS_STATUS hdd_parse_config_ini(hdd_context_t* pHddCtx) if(status) { - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d\n",__func__, status); + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d",__func__, status); vos_status = VOS_STATUS_E_FAILURE; goto config_exit; } if(!fw || !fw->data || !fw->size) { - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: %s download failed\n", + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: %s download failed", __func__, WLAN_INI_FILE); vos_status = VOS_STATUS_E_FAILURE; goto config_exit; @@ -3480,7 +3480,7 @@ VOS_STATUS hdd_parse_config_ini(hdd_context_t* pHddCtx) cfgIniTable[i].name= name; cfgIniTable[i++].value= value; if(i >= MAX_CFG_INI_ITEMS) { - hddLog(LOGE,"%s: Number of items in %s > %d \n", + hddLog(LOGE,"%s: Number of items in %s > %d", __func__, WLAN_INI_FILE, MAX_CFG_INI_ITEMS); break; } @@ -3524,22 +3524,22 @@ static void print_hdd_cfg(hdd_context_t *pHddCtx) i, MAC_ADDR_ARRAY(pHddCtx->cfg_ini->intfMacAddr[i].bytes)); } - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]\n",pHddCtx->cfg_ini->apUapsdEnabled); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]",pHddCtx->cfg_ini->apUapsdEnabled); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAPCntryCode] Value =[%c%c%c]\n", + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAPCntryCode] Value =[%c%c%c]", pHddCtx->cfg_ini->apCntryCode[0],pHddCtx->cfg_ini->apCntryCode[1], pHddCtx->cfg_ini->apCntryCode[2]); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApProt] value = [%u]", pHddCtx->cfg_ini->apProtEnabled); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAPAutoShutOff] Value = [%u]\n", pHddCtx->cfg_ini->nAPAutoShutOff); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gAPAutoShutOff] Value = [%u]", pHddCtx->cfg_ini->nAPAutoShutOff); #ifdef FEATURE_WLAN_AUTO_SHUTDOWN - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanAutoShutdown] Value = [%u]\n", pHddCtx->cfg_ini->WlanAutoShutdown); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanAutoShutdown] Value = [%u]", pHddCtx->cfg_ini->WlanAutoShutdown); #endif - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]\n", pHddCtx->cfg_ini->nEnableListenMode); - VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApProtection] value = [%u]\n",pHddCtx->cfg_ini->apProtection); - VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApOBSSProt] value = [%u]\n",pHddCtx->cfg_ini->apOBSSProtEnabled); - VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApAutoChannelSelection] value = [%u]\n",pHddCtx->cfg_ini->apAutoChannelSelection); - VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gACSAllowedChannels] value = [%s]\n", pHddCtx->cfg_ini->acsAllowedChnls); - VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gACSBandSwitchThreshold] value = [%u]\n", pHddCtx->cfg_ini->acsBandSwitchThreshold); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]", pHddCtx->cfg_ini->nEnableListenMode); + VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApProtection] value = [%u]",pHddCtx->cfg_ini->apProtection); + VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApOBSSProt] value = [%u]",pHddCtx->cfg_ini->apOBSSProtEnabled); + VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gApAutoChannelSelection] value = [%u]",pHddCtx->cfg_ini->apAutoChannelSelection); + VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gACSAllowedChannels] value = [%s]", pHddCtx->cfg_ini->acsAllowedChnls); + VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gACSBandSwitchThreshold] value = [%u]", pHddCtx->cfg_ini->acsBandSwitchThreshold); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]",pHddCtx->cfg_ini->nChannelBondingMode24GHz); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]",pHddCtx->cfg_ini->nChannelBondingMode5GHz); @@ -3670,7 +3670,7 @@ static void print_hdd_cfg(hdd_context_t *pHddCtx) VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gReportMaxLinkSpeed] Value = [%u] ",pHddCtx->cfg_ini->reportMaxLinkSpeed); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [thermalMitigationEnable] Value = [%u] ",pHddCtx->cfg_ini->thermalMitigationEnable); #ifdef WLAN_FEATURE_11AC - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gVhtChannelWidth] value = [%u]\n",pHddCtx->cfg_ini->vhtChannelWidth); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [gVhtChannelWidth] value = [%u]",pHddCtx->cfg_ini->vhtChannelWidth); #endif VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [enableFirstScan2GOnly] Value = [%u] ",pHddCtx->cfg_ini->enableFirstScan2GOnly); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Name = [skipDfsChnlInP2pSearch] Value = [%u] ",pHddCtx->cfg_ini->skipDfsChnlInP2pSearch); @@ -3885,14 +3885,14 @@ VOS_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) if (status) { - hddLog(VOS_TRACE_LEVEL_WARN, "%s: request_firmware failed %d\n", + hddLog(VOS_TRACE_LEVEL_WARN, "%s: request_firmware failed %d", __func__, status); vos_status = VOS_STATUS_E_FAILURE; return vos_status; } if (!fw || !fw->data || !fw->size) { - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: invalid firmware\n", __func__); + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__); vos_status = VOS_STATUS_E_INVAL; goto config_exit; } @@ -3935,10 +3935,10 @@ VOS_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) buffer = line; } if (i <= VOS_MAX_CONCURRENCY_PERSONA) { - hddLog(VOS_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided\n", __func__, i); + hddLog(VOS_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided", __func__, i); } else { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: invalid number of Mac address provided, nMac = %d\n", + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: invalid number of Mac address provided, nMac = %d", __func__, i); vos_status = VOS_STATUS_E_INVAL; goto config_exit; @@ -4123,7 +4123,7 @@ static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t *pHddCtx, tCfgIniEntry* iniTa else if ( WLAN_PARAM_String == pRegEntry->RegType ) { #ifdef WLAN_CFG_DEBUG - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "RegName = %s, VarOffset %u VarSize %u VarDefault %s\n", + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "RegName = %s, VarOffset %u VarSize %u VarDefault %s", pRegEntry->RegName, pRegEntry->VarOffset, pRegEntry->VarSize, (char*)pRegEntry->VarDefault); #endif @@ -4132,7 +4132,7 @@ static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t *pHddCtx, tCfgIniEntry* iniTa len_value_str = strlen(value_str); if(len_value_str > (pRegEntry->VarSize - 1)) { - hddLog(LOGE, "%s: Invalid Value=[%s] specified for Name=[%s] in %s\n", + hddLog(LOGE, "%s: Invalid Value=[%s] specified for Name=[%s] in %s", __func__, value_str, pRegEntry->RegName, WLAN_INI_FILE); cbOutString = utilMin( strlen( (char *)pRegEntry->VarDefault ), pRegEntry->VarSize - 1 ); memcpy( pField, (void *)(pRegEntry->VarDefault), cbOutString ); @@ -4155,7 +4155,7 @@ static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t *pHddCtx, tCfgIniEntry* iniTa else if ( WLAN_PARAM_MacAddr == pRegEntry->RegType ) { if(pRegEntry->VarSize != VOS_MAC_ADDR_SIZE) { - hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]\n", + hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]", __func__, pRegEntry->VarSize, pRegEntry->RegName); continue; } @@ -4163,7 +4163,7 @@ static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t *pHddCtx, tCfgIniEntry* iniTa if ( match_status == VOS_STATUS_SUCCESS) { len_value_str = strlen(value_str); if(len_value_str != (VOS_MAC_ADDR_SIZE*2)) { - hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s\n", + hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s", __func__, value_str, pRegEntry->RegName, WLAN_INI_FILE); } else @@ -4178,7 +4178,7 @@ static VOS_STATUS hdd_apply_cfg_ini( hdd_context_t *pHddCtx, tCfgIniEntry* iniTa } else { - hddLog(LOGE, "%s: Unknown param type for name[%s] in registry table\n", + hddLog(LOGE, "%s: Unknown param type for name[%s] in registry table", __func__, pRegEntry->RegName); } @@ -4329,7 +4329,7 @@ static void hdd_set_power_save_config(hdd_context_t *pHddCtx, tSmeConfigParams * if (sme_SetConfigPowerSave(pHddCtx->hHal, ePMC_BEACON_MODE_POWER_SAVE, &bmpsParams)== eHAL_STATUS_FAILURE) { - hddLog(LOGE, "SetConfigPowerSave failed to set BMPS params\n"); + hddLog(LOGE, "SetConfigPowerSave failed to set BMPS params"); } if(pConfig->fIsAutoBmpsTimerEnabled) @@ -4451,21 +4451,21 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) pConfig->ShortGI20MhzEnable, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_20MHZ to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_20MHZ to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_CAL_CONTROL, pConfig->Calibration, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_CAL_CONTROL to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_CAL_CONTROL to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_CAL_PERIOD, pConfig->CalibrationPeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_CAL_PERIOD to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_CAL_PERIOD to CCM"); } if ( 0 != pConfig->Cfg1Id ) @@ -4474,7 +4474,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on Cfg1Id to CCM\n"); + hddLog(LOGE, "Could not pass on Cfg1Id to CCM"); } } @@ -4485,7 +4485,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on Cfg2Id to CCM\n"); + hddLog(LOGE, "Could not pass on Cfg2Id to CCM"); } } @@ -4495,7 +4495,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on Cfg3Id to CCM\n"); + hddLog(LOGE, "Could not pass on Cfg3Id to CCM"); } } @@ -4505,7 +4505,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on Cfg4Id to CCM\n"); + hddLog(LOGE, "Could not pass on Cfg4Id to CCM"); } } @@ -4515,7 +4515,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on Cfg5Id to CCM\n"); + hddLog(LOGE, "Could not pass on Cfg5Id to CCM"); } } @@ -4523,28 +4523,28 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_BA_AUTO_SETUP to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_BA_AUTO_SETUP to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FIXED_RATE, pConfig->TxRate, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_FIXED_RATE to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_FIXED_RATE to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MAX_RX_AMPDU_FACTOR, pConfig->MaxRxAmpduFactor, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_HT_AMPDU_PARAMS_MAX_RX_AMPDU_FACTOR to CCM\n"); + hddLog(LOGE,"Could not pass on WNI_CFG_HT_AMPDU_PARAMS_MAX_RX_AMPDU_FACTOR to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SHORT_PREAMBLE, pConfig->fIsShortPreamble, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_SHORT_PREAMBLE to CCM\n"); + hddLog(LOGE,"Could not pass on WNI_CFG_SHORT_PREAMBLE to CCM"); } if (pConfig->fIsAutoIbssBssid) @@ -4553,7 +4553,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM\n"); + hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM"); } } else @@ -4567,13 +4567,13 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM\n"); + hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM"); } } else { fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM\n"); + hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM"); } } @@ -4583,7 +4583,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) { fStatus = FALSE; hddLog(LOGE, "Could not pass on WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME" - " to CCM\n"); + " to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME, @@ -4592,125 +4592,125 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) { fStatus = FALSE; hddLog(LOGE, "Could not pass on WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME" - " to CCM\n"); + " to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_BEACON_INTERVAL, pConfig->nBeaconInterval, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_BEACON_INTERVAL to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_BEACON_INTERVAL to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MAX_PS_POLL, pConfig->nMaxPsPoll, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_MAX_PS_POLL to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_MAX_PS_POLL to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_CURRENT_RX_ANTENNA, pConfig-> nRxAnt, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Failure: Could not pass on WNI_CFG_CURRENT_RX_ANTENNA configuration info to HAL\n" ); + hddLog(LOGE, "Failure: Could not pass on WNI_CFG_CURRENT_RX_ANTENNA configuration info to HAL"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, pConfig->fIsLowGainOverride, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RSSI_FILTER_PERIOD, pConfig->nRssiFilterPeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_RSSI_FILTER_PERIOD to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_RSSI_FILTER_PERIOD to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, pConfig->fIgnoreDtim, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_IGNORE_DTIM configuration to CCM\n" ); + hddLog(LOGE, "Could not pass on WNI_IGNORE_DTIM configuration to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_HEART_BEAT, pConfig->fEnableFwHeartBeatMonitoring, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_HEART_BEAT configuration info to CCM\n"); + hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_HEART_BEAT configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_BCN_FILTER, pConfig->fEnableFwBeaconFiltering, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_BCN_FILTER configuration info to CCM\n"); + hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_BCN_FILTER configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, pConfig->fEnableFwRssiMonitoring, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_RSSI_MONITOR configuration info to CCM\n"); + hddLog(LOGE, "Failure: Could not pass on WNI_CFG_PS_RSSI_MONITOR configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, pConfig->nDataInactivityTimeout, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT configuration info to CCM\n"); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_NTH_BEACON_FILTER, pConfig->nthBeaconFilter, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_NTH_BEACON_FILTER configuration info to CCM\n"); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_NTH_BEACON_FILTER configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_LTE_COEX, pConfig->enableLTECoex, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LTE_COEX to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LTE_COEX to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE, pConfig->nEnableListenMode, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT, pConfig->apKeepAlivePeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_AP_KEEP_ALIVE_TIMEOUT to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_AP_KEEP_ALIVE_TIMEOUT to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT, pConfig->goKeepAlivePeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_GO_KEEP_ALIVE_TIMEOUT to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_GO_KEEP_ALIVE_TIMEOUT to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_LINK_MONITOR_TIMEOUT, pConfig->apLinkMonitorPeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_AP_LINK_MONITOR_TIMEOUT to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_AP_LINK_MONITOR_TIMEOUT to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_GO_LINK_MONITOR_TIMEOUT, pConfig->goLinkMonitorPeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CCM"); } @@ -4719,21 +4719,21 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_ENABLE configuration info to CCM\n"); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_ENABLE configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_OPERATING_CHAN_MAX, pConfig->nInChanMeasMaxDuration, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_OPERATING_CHAN_MAX configuration info to CCM\n"); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_OPERATING_CHAN_MAX configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RRM_NON_OPERATING_CHAN_MAX, pConfig->nOutChanMeasMaxDuration, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_OUT_CHAN_MAX configuration info to CCM\n"); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RRM_OUT_CHAN_MAX configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, pConfig->mcastBcastFilterSetting, @@ -4744,108 +4744,108 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_SINGLE_TID_RC configuration info to CCM\n"); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_SINGLE_TID_RC configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_WAKEUP_EN, pConfig->teleBcnWakeupEn, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_WAKEUP_EN configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_WAKEUP_EN configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI, pConfig->nTeleBcnTransListenInterval, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_TRANS_LI configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_TRANS_LI configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI, pConfig->nTeleBcnMaxListenInterval, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_MAX_LI configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_MAX_LI configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, pConfig->nTeleBcnTransLiNumIdleBeacons, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, pConfig->nTeleBcnMaxLiNumIdleBeacons, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RF_SETTLING_TIME_CLK, pConfig->rfSettlingTimeUs, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RF_SETTLING_TIME_CLK configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RF_SETTLING_TIME_CLK configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, pConfig->infraStaKeepAlivePeriod, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_DYNAMIC_PS_POLL_VALUE, pConfig->dynamicPsPollValue, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_DYNAMIC_PS_POLL_VALUE configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_DYNAMIC_PS_POLL_VALUE configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT, pConfig->nNullDataApRespTimeout, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_PS_NULLDATA_DELAY_TIMEOUT configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_PS_NULLDATA_DELAY_TIMEOUT configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD configuration info to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, pConfig->FragmentationThreshold, NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_FRAGMENTATION_THRESHOLD configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_FRAGMENTATION_THRESHOLD configuration info to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_RTS_THRESHOLD, pConfig->RTSThreshold, NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RTS_THRESHOLD configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_RTS_THRESHOLD configuration info to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_11D_ENABLED, pConfig->Is11dSupportEnabled, NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_11D_ENABLED configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_11D_ENABLED configuration info to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HEART_BEAT_THRESHOLD, pConfig->HeartbeatThresh24, NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_HEART_BEAT_THRESHOLD configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_HEART_BEAT_THRESHOLD configuration info to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD configuration info to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_CLOSE_LOOP, @@ -4853,7 +4853,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_CLOSE_LOOP to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_CLOSE_LOOP to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_TX_PWR_CTRL_ENABLE, @@ -4861,14 +4861,14 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_TX_PWR_CTRL_ENABLE to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_TX_PWR_CTRL_ENABLE to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_SHORT_GI_40MHZ, pConfig->ShortGI40MhzEnable, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_40MHZ to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_40MHZ to CCM"); } @@ -4876,7 +4876,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MC_ADDR_LIST to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MC_ADDR_LIST to CCM"); } #ifdef WLAN_FEATURE_11AC @@ -4900,7 +4900,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CCM"); } ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_VHT_RX_MCS_MAP, &temp); @@ -4913,7 +4913,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CCM"); } ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, &temp); @@ -4922,7 +4922,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2); VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "vhtRxMCS2x2 - %x temp - %u enable2x2 %d\n", + "vhtRxMCS2x2 - %x temp - %u enable2x2 %d", pConfig->vhtRxMCS2x2, temp, pConfig->enable2x2); if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, @@ -4930,7 +4930,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CCM"); } /* Currently shortGI40Mhz is used for shortGI80Mhz */ if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_SHORT_GI_80MHZ, @@ -4938,7 +4938,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass WNI_VHT_SHORT_GI_80MHZ to CCM\n"); + hddLog(LOGE, "Could not pass WNI_VHT_SHORT_GI_80MHZ to CCM"); } // Hardware is capable of doing 128K AMPDU in 11AC mode if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, @@ -4947,7 +4947,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_AMPDU_LEN_EXPONENT to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_AMPDU_LEN_EXPONENT to CCM"); } /* Change MU Bformee only when TxBF is enabled */ @@ -4965,7 +4965,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) { fStatus = FALSE; hddLog(LOGE, "Could not pass on\ - WNI_CFG_VHT_MU_BEAMFORMEE_CAP to CCM\n"); + WNI_CFG_VHT_MU_BEAMFORMEE_CAP to CCM"); } } } @@ -4975,7 +4975,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_MAX_MPDU_LENGTH to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_MAX_MPDU_LENGTH to CCM"); } } } @@ -4985,7 +4985,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_NUM_BUFF_ADVERT to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_NUM_BUFF_ADVERT to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_HT_RX_STBC, @@ -4993,7 +4993,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_HT_RX_STBC to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_HT_RX_STBC to CCM"); } ccmCfgGetInt(pHddCtx->hHal, WNI_CFG_HT_CAP_INFO, &val); @@ -5008,7 +5008,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_RXSTBC, @@ -5016,7 +5016,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RXSTBC to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RXSTBC to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_TXSTBC, @@ -5024,7 +5024,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TXSTBC to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TXSTBC to CCM"); } if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_VHT_LDPC_CODING_CAP, @@ -5032,7 +5032,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_VHT_LDPC_CODING_CAP to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_VHT_LDPC_CODING_CAP to CCM"); } #ifdef WLAN_SOFTAP_VSTA_FEATURE @@ -5055,7 +5055,7 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) NULL, eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE,"Failure: Could not pass on WNI_CFG_ASSOC_STA_LIMIT configuration info to CCM\n" ); + hddLog(LOGE,"Failure: Could not pass on WNI_CFG_ASSOC_STA_LIMIT configuration info to CCM"); } #endif if(ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION, @@ -5063,14 +5063,14 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) ==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LPWR_IMG_TRANSITION to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LPWR_IMG_TRANSITION to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, pConfig->enableMCCAdaptiveScheduler, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) { fStatus = FALSE; - hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED to CCM\n"); + hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED to CCM"); } if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP, pConfig->disableLDPCWithTxbfAP, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) @@ -5192,7 +5192,7 @@ VOS_STATUS hdd_set_sme_config( hdd_context_t *pHddCtx ) vos_mem_zero( &smeConfig, sizeof( smeConfig ) ); VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, - "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d\n", __func__, + "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d", __func__, pConfig->WmmMode, pConfig->b80211eIsEnabled, pConfig->dot11Mode); // Config params obtained from the registry diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index c5945efaea18..3299127d1730 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -1247,7 +1247,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t* pAdapter, u8 key_index, tANI_U8 *pKeyPtr = NULL; int n = 0; - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__,pAdapter->device_mode); vos_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); @@ -1268,7 +1268,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t* pAdapter, u8 key_index, pKeyPtr = setKey.Key; memcpy( pKeyPtr, key, key_Len); - hddLog(VOS_TRACE_LEVEL_INFO,"\n%s: WAPI KEY LENGTH:0x%04x", + hddLog(VOS_TRACE_LEVEL_INFO,"%s: WAPI KEY LENGTH:0x%04x", __func__, key_Len); for (n = 0 ; n < key_Len; n++) hddLog(VOS_TRACE_LEVEL_INFO, "%s WAPI KEY Data[%d]:%02x ", @@ -1737,7 +1737,7 @@ static int wlan_hdd_cfg80211_update_apies(hdd_adapter_t* pHostapdAdapter, eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA2 to CCM\n"); + "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA2 to CCM"); } } @@ -1748,7 +1748,7 @@ static int wlan_hdd_cfg80211_update_apies(hdd_adapter_t* pHostapdAdapter, eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA3 to CCM\n"); + "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA3 to CCM"); } } @@ -1811,7 +1811,7 @@ static int wlan_hdd_cfg80211_update_apies(hdd_adapter_t* pHostapdAdapter, eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_ASSOC_RSP_ADDNIE_FLAG to CCM\n"); + "Could not pass on WNI_CFG_ASSOC_RSP_ADDNIE_FLAG to CCM"); } } @@ -1906,13 +1906,13 @@ static int wlan_hdd_cfg80211_set_channel( struct wiphy *wiphy, struct net_device if( NULL == dev ) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Called with dev = NULL.\n", __func__); + "%s: Called with dev = NULL.", __func__); return -ENODEV; } pAdapter = WLAN_HDD_GET_PRIV_PTR( dev ); hddLog(VOS_TRACE_LEVEL_INFO, - "%s: device_mode = %d freq = %d \n",__func__, + "%s: device_mode = %d freq = %d",__func__, pAdapter->device_mode, chan->center_freq); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -1937,7 +1937,7 @@ static int wlan_hdd_cfg80211_set_channel( struct wiphy *wiphy, struct net_device (WNI_CFG_CURRENT_CHANNEL_STAMAX < channel)) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Channel [%d] is outside valid range from %d to %d\n", + "%s: Channel [%d] is outside valid range from %d to %d", __func__, channel, WNI_CFG_CURRENT_CHANNEL_STAMIN, WNI_CFG_CURRENT_CHANNEL_STAMAX); return -EINVAL; @@ -1951,7 +1951,7 @@ static int wlan_hdd_cfg80211_set_channel( struct wiphy *wiphy, struct net_device if(VOS_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter,channel)) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Invalid Channel [%d] \n", __func__, channel); + "%s: Invalid Channel [%d]", __func__, channel); return -EINVAL; } hddLog(VOS_TRACE_LEVEL_INFO_HIGH, @@ -1970,7 +1970,7 @@ static int wlan_hdd_cfg80211_set_channel( struct wiphy *wiphy, struct net_device { /* Link is up then return cant set channel*/ hddLog( VOS_TRACE_LEVEL_ERROR, - "%s: IBSS Associated, can't set the channel\n", __func__); + "%s: IBSS Associated, can't set the channel", __func__); return -EINVAL; } @@ -1989,7 +1989,7 @@ static int wlan_hdd_cfg80211_set_channel( struct wiphy *wiphy, struct net_device wlan_hdd_validate_operation_channel(pAdapter,channel)) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Invalid Channel [%d] \n", __func__, channel); + "%s: Invalid Channel [%d]", __func__, channel); return -EINVAL; } (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig.channel = channel; @@ -2015,7 +2015,7 @@ static int wlan_hdd_cfg80211_set_channel( struct wiphy *wiphy, struct net_device wlan_hdd_validate_operation_channel(pAdapter,channel)) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Invalid Channel [%d] \n", __func__, channel); + "%s: Invalid Channel [%d]", __func__, channel); return -EINVAL; } (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig.channel = channel; @@ -2118,7 +2118,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->dtim_period = pBeacon->dtim_period; - hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"****pConfig->dtim_period=%d***\n", + hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"****pConfig->dtim_period=%d***", pConfig->dtim_period); pConfig->enOverLapCh = !!pHddCtx->cfg_ini->gEnableOverLapCh; @@ -2165,7 +2165,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, if(VOS_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pHostapdAdapter,pConfig->channel)) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Invalid Channel [%d] \n", __func__, pConfig->channel); + "%s: Invalid Channel [%d]", __func__, pConfig->channel); return -EINVAL; } } @@ -2199,7 +2199,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, { if(pIe[1] < (2 + WPS_OUI_TYPE_SIZE)) { - hddLog( VOS_TRACE_LEVEL_ERROR, "**Wps Ie Length is too small***\n"); + hddLog( VOS_TRACE_LEVEL_ERROR, "**Wps Ie Length is too small***"); return -EINVAL; } else if(memcmp(&pIe[2], WPS_OUI_TYPE, WPS_OUI_TYPE_SIZE) == 0) @@ -2254,7 +2254,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->ucEncryptType = RSNEncryptType; hddLog( LOG1, FL("CSR AuthType = %d, " - "EncryptionType = %d mcEncryptionType = %d\n"), + "EncryptionType = %d mcEncryptionType = %d"), RSNAuthType, RSNEncryptType, mcRSNEncryptType); } } @@ -2293,7 +2293,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->ucEncryptType = RSNEncryptType; hddLog( LOG1, FL("CSR AuthType = %d, " - "EncryptionType = %d mcEncryptionType = %d\n"), + "EncryptionType = %d mcEncryptionType = %d"), RSNAuthType, RSNEncryptType, mcRSNEncryptType); } } @@ -2379,7 +2379,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, { pConfig->SapMacaddr_acl = pIe[6]; pConfig->num_deny_mac = pIe[7]; - hddLog(VOS_TRACE_LEVEL_INFO,"acl type = %d no deny mac = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO,"acl type = %d no deny mac = %d", pIe[6], pIe[7]); if (pConfig->num_deny_mac > MAX_ACL_MAC_ADDRESS) pConfig->num_deny_mac = MAX_ACL_MAC_ADDRESS; @@ -2405,7 +2405,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, { pConfig->SapMacaddr_acl = pIe[6]; pConfig->num_accept_mac = pIe[7]; - hddLog(VOS_TRACE_LEVEL_INFO,"acl type = %d no accept mac = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO,"acl type = %d no accept mac = %d", pIe[6], pIe[7]); if (pConfig->num_accept_mac > MAX_ACL_MAC_ADDRESS) pConfig->num_accept_mac = MAX_ACL_MAC_ADDRESS; @@ -2466,18 +2466,18 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->obssProtEnabled = (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->apOBSSProtEnabled; - hddLog(LOGW, FL("SOftAP macaddress : "MAC_ADDRESS_STR"\n"), + hddLog(LOGW, FL("SOftAP macaddress : "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHostapdAdapter->macAddressCurrent.bytes)); - hddLog(LOGW,FL("ssid =%s\n"), pConfig->SSIDinfo.ssid.ssId); - hddLog(LOGW,FL("beaconint=%d, channel=%d\n"), (int)pConfig->beacon_int, - (int)pConfig->channel); - hddLog(LOGW,FL("hw_mode=%x\n"), pConfig->SapHw_mode); - hddLog(LOGW,FL("privacy=%d, authType=%d\n"), pConfig->privacy, - pConfig->authType); - hddLog(LOGW,FL("RSN/WPALen=%d, \n"),(int)pConfig->RSNWPAReqIELength); - hddLog(LOGW,FL("Uapsd = %d\n"),pConfig->UapsdEnable); - hddLog(LOGW,FL("ProtEnabled = %d, OBSSProtEnabled = %d\n"), - pConfig->protEnabled, pConfig->obssProtEnabled); + hddLog(LOGW,FL("ssid =%s, beaconint=%d, channel=%d"), + pConfig->SSIDinfo.ssid.ssId, (int)pConfig->beacon_int, + (int)pConfig->channel); + hddLog(LOGW,FL("hw_mode=%x, privacy=%d, authType=%d"), + pConfig->SapHw_mode, pConfig->privacy, + pConfig->authType); + hddLog(LOGW,FL("RSN/WPALen=%d, Uapsd = %d"), + (int)pConfig->RSNWPAReqIELength, pConfig->UapsdEnable); + hddLog(LOGW,FL("ProtEnabled = %d, OBSSProtEnabled = %d"), + pConfig->protEnabled, pConfig->obssProtEnabled); if(test_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags)) { @@ -2510,7 +2510,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pSapEventCallback, pConfig, (v_PVOID_t)pHostapdAdapter->dev); if (!VOS_IS_STATUS_SUCCESS(status)) { - hddLog(LOGE,FL("SAP Start Bss fail\n")); + hddLog(LOGE,FL("SAP Start Bss fail")); return -EINVAL; } @@ -2522,7 +2522,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, if (!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("ERROR: HDD vos wait for single_event failed!!\n")); + ("ERROR: HDD vos wait for single_event failed!!")); smeGetCommandQStatus(hHal); VOS_ASSERT(0); return -EINVAL; @@ -2566,7 +2566,7 @@ static int wlan_hdd_cfg80211_add_beacon(struct wiphy *wiphy, ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "device mode=%d\n",pAdapter->device_mode); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "device mode=%d",pAdapter->device_mode); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); @@ -2594,7 +2594,7 @@ static int wlan_hdd_cfg80211_add_beacon(struct wiphy *wiphy, if(status != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_FATAL, - "%s:Error!!! Allocating the new beacon\n",__func__); + "%s:Error!!! Allocating the new beacon",__func__); return -EINVAL; } @@ -2622,7 +2622,7 @@ static int wlan_hdd_cfg80211_set_beacon(struct wiphy *wiphy, ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__,pAdapter->device_mode); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -2650,7 +2650,7 @@ static int wlan_hdd_cfg80211_set_beacon(struct wiphy *wiphy, if(status != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_FATAL, - "%s: Error!!! Allocating the new beacon\n",__func__); + "%s: Error!!! Allocating the new beacon",__func__); return -EINVAL; } @@ -2712,7 +2712,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy, pScanInfo = &pAdapter->scan_info; - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__,pAdapter->device_mode); if ((pScanInfo != NULL) && pScanInfo->mScanPending && staAdapter) @@ -2761,7 +2761,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy, if (!VOS_IS_STATUS_SUCCESS(status)) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("ERROR: HDD vos wait for single_event failed!!\n")); + ("ERROR: HDD vos wait for single_event failed!!")); VOS_ASSERT(0); } } @@ -2772,7 +2772,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy, if(status != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_FATAL, - "%s:Error!!! Stopping the BSS\n",__func__); + "%s:Error!!! Stopping the BSS",__func__); return -EINVAL; } @@ -2781,7 +2781,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy, ==eHAL_STATUS_FAILURE) { hddLog(LOGE, - "Could not pass on WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG to CCM\n"); + "Could not pass on WNI_CFG_PROBE_RSP_BCN_ADDNIE_FLAG to CCM"); } if ( eHAL_STATUS_FAILURE == ccmCfgSetInt(pHddCtx->hHal, @@ -2789,7 +2789,7 @@ static int wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy, eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_ASSOC_RSP_ADDNIE_FLAG to CCM\n"); + "Could not pass on WNI_CFG_ASSOC_RSP_ADDNIE_FLAG to CCM"); } // Reset WNI_CFG_PROBE_RSP Flags @@ -2918,7 +2918,7 @@ static int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__, pAdapter->device_mode); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -2946,7 +2946,7 @@ static int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, if(status != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_FATAL, - "%s: Error!!! Allocating the new beacon\n",__func__); + "%s: Error!!! Allocating the new beacon",__func__); return -EINVAL; } @@ -3338,7 +3338,7 @@ int wlan_hdd_cfg80211_change_iface( struct wiphy *wiphy, else { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: SME Change Country code failed \n",__func__); + "%s: SME Change Country code failed",__func__); return -EINVAL; } } @@ -4236,7 +4236,7 @@ static int wlan_hdd_cfg80211_get_key( ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__,pAdapter->device_mode); memset(¶ms, 0, sizeof(params)); @@ -4318,7 +4318,7 @@ static int wlan_hdd_cfg80211_del_key( struct wiphy *wiphy, ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: device_mode = %d", __func__,pAdapter->device_mode); if (CSR_MAX_NUM_KEY <= key_index) @@ -4437,7 +4437,7 @@ static int wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy, return -EINVAL; } - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d key_index = %d \n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d key_index = %d", __func__,pAdapter->device_mode, key_index); if (CSR_MAX_NUM_KEY <= key_index) @@ -4565,7 +4565,7 @@ static struct cfg80211_bss* wlan_hdd_cfg80211_inform_bss( if( NULL == pBssDesc ) { - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: pBssDesc is NULL\n", __func__); + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: pBssDesc is NULL", __func__); return bss; } @@ -4575,7 +4575,7 @@ static struct cfg80211_bss* wlan_hdd_cfg80211_inform_bss( if( NULL == ie ) { - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: IE of BSS descriptor is NULL\n", __func__); + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: IE of BSS descriptor is NULL", __func__); return bss; } @@ -4879,7 +4879,7 @@ static int wlan_hdd_cfg80211_update_bss( struct wiphy *wiphy, /* no scan results */ if (NULL == pResult) { - hddLog(VOS_TRACE_LEVEL_INFO, "%s: No scan result\n", __func__); + hddLog(VOS_TRACE_LEVEL_INFO, "%s: No scan result", __func__); return status; } @@ -4905,7 +4905,7 @@ static int wlan_hdd_cfg80211_update_bss( struct wiphy *wiphy, if (NULL == bss_status) { hddLog(VOS_TRACE_LEVEL_INFO, - "%s: NULL returned by cfg80211_inform_bss\n", __func__); + "%s: NULL returned by cfg80211_inform_bss", __func__); } else { @@ -4935,7 +4935,7 @@ void hddPrintPmkId(tANI_U8 *pmkId, tANI_U8 logLevel) { VOS_TRACE(VOS_MODULE_ID_HDD, logLevel, - "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", + "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", pmkId[0], pmkId[1], pmkId[2], pmkId[3], pmkId[4], pmkId[5], pmkId[6], pmkId[7], pmkId[8], pmkId[9], pmkId[10], pmkId[11], pmkId[12], pmkId[13], pmkId[14], pmkId[15]); @@ -4951,14 +4951,12 @@ hddPrintPmkId(tANI_U8 *pmkId, tANI_U8 logLevel) { \ hddLog(VOS_TRACE_LEVEL_INFO, "BSSID (MAC) address:\t"); \ hddPrintMacAddr(bssid, VOS_TRACE_LEVEL_INFO);\ - hddLog(VOS_TRACE_LEVEL_INFO, "\n"); \ } #define dump_pmkid(pMac, pmkid) \ { \ hddLog(VOS_TRACE_LEVEL_INFO, "PMKSA-ID:\t"); \ hddPrintPmkId(pmkid, VOS_TRACE_LEVEL_INFO);\ - hddLog(VOS_TRACE_LEVEL_INFO, "\n"); \ } #if defined(FEATURE_WLAN_LFR) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) @@ -4979,7 +4977,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify( if( NULL == pRoamInfo ) { - hddLog(VOS_TRACE_LEVEL_FATAL, "%s: pRoamInfo is NULL\n", __func__); + hddLog(VOS_TRACE_LEVEL_FATAL, "%s: pRoamInfo is NULL", __func__); return -EINVAL; } @@ -5129,7 +5127,7 @@ static eHalStatus hdd_cfg80211_scan_done_callback(tHalHandle halHandle, hddLog(VOS_TRACE_LEVEL_INFO, "%s called with halHandle = %p, pContext = %p," - "scanID = %d, returned status = %d\n", + "scanID = %d, returned status = %d", __func__, halHandle, pContext, (int) scanId, (int) status); pScanInfo->mScanPendingCounter = 0; @@ -5155,7 +5153,7 @@ static eHalStatus hdd_cfg80211_scan_done_callback(tHalHandle halHandle, { hddLog(VOS_TRACE_LEVEL_INFO, "%s called with mismatched scanId pScanInfo->scanId = %d " - "scanId = %d \n", __func__, (int) pScanInfo->scanId, + "scanId = %d", __func__, (int) pScanInfo->scanId, (int) scanId); } @@ -5197,7 +5195,7 @@ static eHalStatus hdd_cfg80211_scan_done_callback(tHalHandle halHandle, if (!req) { - hddLog(VOS_TRACE_LEVEL_ERROR, "request is became NULL\n"); + hddLog(VOS_TRACE_LEVEL_ERROR, "request is became NULL"); pScanInfo->mScanPending = VOS_FALSE; goto allow_suspend; } @@ -5338,7 +5336,7 @@ int wlan_hdd_cfg80211_scan( struct wiphy *wiphy, ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__,pAdapter->device_mode); status = wlan_hdd_validate_context(pHddCtx); @@ -6180,7 +6178,7 @@ int wlan_hdd_cfg80211_set_ie( hdd_adapter_t *pAdapter, eLen = *genie++; remLen -= 2; - hddLog(VOS_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]", __func__, elementId, eLen); switch ( elementId ) @@ -6452,7 +6450,7 @@ int wlan_hdd_cfg80211_set_ie( hdd_adapter_t *pAdapter, } else { - hddLog(VOS_TRACE_LEVEL_FATAL, "Invalid akmSuite count\n"); + hddLog(VOS_TRACE_LEVEL_FATAL, "Invalid akmSuite count"); VOS_ASSERT(0); return -EINVAL; } @@ -6691,7 +6689,7 @@ static int wlan_hdd_cfg80211_connect( struct wiphy *wiphy, } hddLog(VOS_TRACE_LEVEL_INFO, - "%s: device_mode = %d\n",__func__,pAdapter->device_mode); + "%s: device_mode = %d",__func__,pAdapter->device_mode); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) @@ -6808,7 +6806,7 @@ int wlan_hdd_disconnect( hdd_adapter_t *pAdapter, u16 reason ) if ( 0 != status ) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s csrRoamDisconnect failure, returned %d \n", + "%s csrRoamDisconnect failure, returned %d", __func__, (int)status ); return -EINVAL; } @@ -6852,7 +6850,7 @@ static int wlan_hdd_cfg80211_disconnect( struct wiphy *wiphy, ENTER(); - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d", __func__,pAdapter->device_mode); hddLog(VOS_TRACE_LEVEL_INFO, "%s: Disconnect called with reason code %d", @@ -6931,7 +6929,7 @@ static int wlan_hdd_cfg80211_disconnect( struct wiphy *wiphy, if ( 0 != status ) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s wlan_hdd_disconnect failure, returned %d \n", + "%s wlan_hdd_disconnect failure, returned %d", __func__, (int)status ); return -EINVAL; } @@ -7059,7 +7057,7 @@ static int wlan_hdd_cfg80211_join_ibss( struct wiphy *wiphy, ENTER(); hddLog(VOS_TRACE_LEVEL_INFO, - "%s: device_mode = %d\n",__func__,pAdapter->device_mode); + "%s: device_mode = %d",__func__,pAdapter->device_mode); status = wlan_hdd_validate_context(pHddCtx); @@ -7072,7 +7070,7 @@ static int wlan_hdd_cfg80211_join_ibss( struct wiphy *wiphy, if (NULL == pWextState) { - hddLog (VOS_TRACE_LEVEL_ERROR, "%s ERROR: Data Storage Corruption\n", + hddLog (VOS_TRACE_LEVEL_ERROR, "%s ERROR: Data Storage Corruption", __func__); return -EIO; } @@ -7082,7 +7080,7 @@ static int wlan_hdd_cfg80211_join_ibss( struct wiphy *wiphy, if ( eCSR_BSS_TYPE_START_IBSS != pRoamProfile->BSSType ) { hddLog (VOS_TRACE_LEVEL_ERROR, - "%s Interface type is not set to IBSS \n", __func__); + "%s Interface type is not set to IBSS", __func__); return -EINVAL; } @@ -7238,10 +7236,10 @@ static int wlan_hdd_cfg80211_leave_ibss( struct wiphy *wiphy, return status; } - hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d\n",__func__,pAdapter->device_mode); + hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d",__func__,pAdapter->device_mode); if (NULL == pWextState) { - hddLog (VOS_TRACE_LEVEL_ERROR, "%s ERROR: Data Storage Corruption\n", + hddLog (VOS_TRACE_LEVEL_ERROR, "%s ERROR: Data Storage Corruption", __func__); return -EIO; } @@ -8040,7 +8038,7 @@ static int wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, if (NULL == pAdapter) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Adapter is NULL\n", __func__); + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -ENODEV; } @@ -8067,7 +8065,7 @@ static int wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, if (!VOS_IS_STATUS_SUCCESS(vos_status)) { hddLog(VOS_TRACE_LEVEL_INFO, - "%s:Failed to enable ARPOFFLOAD Feature %d\n", + "%s:Failed to enable ARPOFFLOAD Feature %d", __func__, vos_status); } } @@ -8515,7 +8513,7 @@ static int wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, if (NULL == pAdapter) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Adapter is NULL\n", __func__); + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -ENODEV; } @@ -8524,13 +8522,13 @@ static int wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, // Added for debug on reception of Re-assoc Req. if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - hddLog(LOGE, FL("Called with Ie of length = %zu when not associated\n"), + hddLog(LOGE, FL("Called with Ie of length = %zu when not associated"), ftie->ie_len); - hddLog(LOGE, FL("Should be Re-assoc Req IEs\n")); + hddLog(LOGE, FL("Should be Re-assoc Req IEs")); } #ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG - hddLog(LOG1, FL("%s called with Ie of length = %zu\n"), __func__, + hddLog(LOG1, FL("%s called with Ie of length = %zu"), __func__, ftie->ie_len); #endif @@ -9177,7 +9175,7 @@ static int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *d if (TDLS_CTX_MAGIC == pAdapter->mgmtTxCompletionStatus) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: " MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY\n", + "%s: " MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY", __func__, MAC_ADDR_ARRAY(peer), action_code); return -EBUSY; } diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index e5fc17884b89..0b5c161a67d4 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -659,7 +659,7 @@ void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable) pHddCtx->sus_res_mcastbcast_filter))) { hddLog (VOS_TRACE_LEVEL_INFO, - "Set offLoadRequest with SIR_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE \n"); + "Set offLoadRequest with SIR_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE"); offLoadRequest.enableOrDisable = SIR_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE; } @@ -720,7 +720,7 @@ VOS_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable) tSirHostOffloadReq offLoadRequest; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - hddLog(VOS_TRACE_LEVEL_INFO, "%s: \n", __func__); + hddLog(VOS_TRACE_LEVEL_INFO, "%s:", __func__); if(fenable) { @@ -740,7 +740,7 @@ VOS_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable) offLoadRequest.offloadType = SIR_IPV4_ARP_REPLY_OFFLOAD; offLoadRequest.enableOrDisable = SIR_OFFLOAD_ENABLE; - hddLog(VOS_TRACE_LEVEL_INFO, "%s: Enabled \n", __func__); + hddLog(VOS_TRACE_LEVEL_INFO, "%s: Enabled", __func__); if (((HDD_MCASTBCASTFILTER_FILTER_ALL_BROADCAST == pHddCtx->sus_res_mcastbcast_filter) || @@ -774,14 +774,14 @@ VOS_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable) pAdapter->sessionId, &offLoadRequest)) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failed to enable HostOffload " - "feature\n", __func__); + "feature", __func__); return VOS_STATUS_E_FAILURE; } return VOS_STATUS_SUCCESS; } else { - hddLog(VOS_TRACE_LEVEL_INFO, "%s:IP Address is not assigned \n", __func__); + hddLog(VOS_TRACE_LEVEL_INFO, "%s:IP Address is not assigned", __func__); return VOS_STATUS_E_AGAIN; } } @@ -796,7 +796,7 @@ VOS_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, v_BOOL_t fenable) pAdapter->sessionId, &offLoadRequest)) { hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to disable host " - "offload feature\n", __func__); + "offload feature", __func__); return VOS_STATUS_E_FAILURE; } return VOS_STATUS_SUCCESS; @@ -1369,7 +1369,7 @@ void hdd_resume_wlan(void) NULL, eANI_BOOLEAN_FALSE); VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "Switch to DTIM%d \n",powerRequest.uListenInterval); + "Switch to DTIM%d",powerRequest.uListenInterval); sme_SetPowerParams( WLAN_HDD_GET_HAL_CTX(pAdapter), &powerRequest, FALSE); if (BMPS == pmcGetPmcState(pHddCtx->hHal)) diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c index 5b19b4681198..ec656e0e1492 100644 --- a/CORE/HDD/src/wlan_hdd_ftm.c +++ b/CORE/HDD/src/wlan_hdd_ftm.c @@ -387,7 +387,7 @@ static v_U32_t wlan_ftm_postmsg(v_U8_t *cmd_ptr, v_U16_t cmd_len) if (VOS_STATUS_SUCCESS != vos_mq_post_message( VOS_MODULE_ID_WDA, (vos_msg_t *)&ftmMsg)) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: : Failed to post Msg to HAL\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: : Failed to post Msg to HAL", __func__); return VOS_STATUS_E_FAILURE; } @@ -1179,12 +1179,12 @@ VOS_STATUS vos_ftm_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 { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: WDA_preStart reporting other error \n",__func__); + "%s: WDA_preStart reporting other error", __func__); } VOS_ASSERT( 0 ); return VOS_STATUS_E_FAILURE; @@ -1469,7 +1469,7 @@ static VOS_STATUS wlan_ftm_send_response(hdd_context_t *pHddCtx){ if( ptt_sock_send_msg_to_app(&pHddCtx->ftm.wnl->wmsg, 0, ANI_NL_MSG_PUMAC, pHddCtx->ftm.wnl->nlh.nlmsg_pid) < 0) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!\n")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!")); return VOS_STATUS_E_FAILURE; } return VOS_STATUS_SUCCESS; @@ -1554,12 +1554,12 @@ static int wlan_hdd_ftm_start(hdd_context_t *pHddCtx) if ( vStatus == VOS_STATUS_E_TIMEOUT ) { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Timeout occurred before WDA_NVDownload_Start complete\n",__func__); + "%s: Timeout occurred before WDA_NVDownload_Start complete", __func__); } else { VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: WDA_NVDownload_Start reporting other error \n",__func__); + "%s: WDA_NVDownload_Start reporting other error", __func__); } VOS_ASSERT(0); goto err_status_failure; @@ -1612,13 +1612,13 @@ err_wda_stop: if(vStatus == VOS_STATUS_E_TIMEOUT) { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: Timeout occurred before WDA_stop complete\n",__func__); + "%s: Timeout occurred before WDA_stop complete", __func__); } else { VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR, - "%s: WDA_stop reporting other error \n",__func__); + "%s: WDA_stop reporting other error", __func__); } VOS_ASSERT(0); } @@ -1798,7 +1798,7 @@ int wlan_hdd_ftm_get_nv_table /* Invalid table size, discard and initialize data */ VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL, "Invalid Table Size %d for Table %d" - " expected size %d\n", nvTable->tableSize, nvTable->nvTable, + " expected size %d", nvTable->tableSize, nvTable->nvTable, pHddCtx->ftm.targetNVTableSize); pHddCtx->ftm.processingNVTable = NV_MAX_TABLE; pHddCtx->ftm.targetNVTableSize = 0; @@ -2976,7 +2976,7 @@ void wlan_hdd_process_ftm_cmd if (!pRequestBuf) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: request buffer is null\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: request buffer is null", __func__); return ; } @@ -2996,7 +2996,7 @@ void wlan_hdd_process_ftm_cmd pHddCtx->ftm.wnl = wnl; if (pRequestBuf->module_type != QUALCOMM_MODULE_TYPE) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Invalid Module Type =%d\n",__func__,pRequestBuf->module_type); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Invalid Module Type =%d", __func__,pRequestBuf->module_type); pHddCtx->ftm.pResponseBuf->ftm_err_code = WLAN_FTM_FAILURE; wlan_ftm_send_response(pHddCtx); @@ -3008,7 +3008,7 @@ void wlan_hdd_process_ftm_cmd case WLAN_FTM_START: if (pHddCtx->ftm.ftm_state == WLAN_FTM_STARTED) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: FTM has already started =%d\n",__func__,pRequestBuf->ftmpkt.ftm_cmd_type); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: FTM has already started =%d", __func__,pRequestBuf->ftmpkt.ftm_cmd_type); pHddCtx->ftm.pResponseBuf->ftm_hdr.data_len -= 1; pHddCtx->ftm.pResponseBuf->ftm_err_code = WLAN_FTM_SUCCESS; wlan_ftm_send_response(pHddCtx); @@ -3035,7 +3035,7 @@ void wlan_hdd_process_ftm_cmd case WLAN_FTM_STOP: if (pHddCtx->ftm.ftm_state != WLAN_FTM_STARTED) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM has not started\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM has not started", __func__); pHddCtx->ftm.pResponseBuf->ftm_err_code = WLAN_FTM_SUCCESS; wlan_ftm_send_response(pHddCtx); return; @@ -3059,12 +3059,12 @@ void wlan_hdd_process_ftm_cmd case WLAN_FTM_CMD: /* if it is regular FTM command, pass it to HAL PHY */ if(pHddCtx->ftm.IsCmdPending == TRUE) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM command pending for process\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM command pending for process", __func__); return; } if (pHddCtx->ftm.ftm_state != WLAN_FTM_STARTED) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM has not started\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM has not started", __func__); pHddCtx->ftm.pResponseBuf->ftm_err_code = WLAN_FTM_FAILURE; wlan_ftm_send_response(pHddCtx); @@ -3083,7 +3083,7 @@ void wlan_hdd_process_ftm_cmd if (NULL == tempRspBuffer) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s:: temp Mem Alloc Fail\n",__func__); + "%s:: temp Mem Alloc Fail", __func__); pHddCtx->ftm.pResponseBuf->ftm_err_code = WLAN_FTM_FAILURE; wlan_ftm_send_response(pHddCtx); return; @@ -3111,7 +3111,7 @@ void wlan_hdd_process_ftm_cmd /*Post the command to the HAL*/ if (wlan_ftm_postmsg(pftm_data, cmd_len) != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM command failed\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: FTM command failed", __func__); return; } @@ -3153,7 +3153,7 @@ void wlan_hdd_process_ftm_cmd default: - hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: Command not supported \n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s:: Command not supported", __func__); return; } @@ -3329,7 +3329,7 @@ static VOS_STATUS wlan_ftm_priv_set_channel(hdd_adapter_t *pAdapter,v_U16_t chan pMsgBody->SetChannel.chId = get_primary_channel(channel, ftm_status.cbmode); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Channel =%d\n",pMsgBody->SetChannel.chId); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Channel =%d", pMsgBody->SetChannel.chId); pMsgBody->SetChannel.cbState = ftm_status.cbmode ; status = wlan_ftm_postmsg((v_U8_t*)pMsgBuf,pMsgBuf->msgBodyLength); @@ -3559,14 +3559,14 @@ static VOS_STATUS wlan_ftm_priv_set_txrate(hdd_adapter_t *pAdapter,char *txrate) hdd_context_t *pHddCtx = (hdd_context_t *)pAdapter->pHddCtx; if(pHddCtx->ftm.ftm_state != WLAN_FTM_STARTED) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Ftm has not started. Please start the ftm.",__func__); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Ftm has not started. Please start the ftm.", __func__); return VOS_STATUS_E_FAILURE; } /* do not allow to change setting when tx pktgen is enabled */ if (ftm_status.frameGenEnabled) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:cannot set txrate when pktgen is enabled.",__func__); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:cannot set txrate when pktgen is enabled.", __func__); return VOS_STATUS_E_FAILURE; } @@ -3577,7 +3577,7 @@ static VOS_STATUS wlan_ftm_priv_set_txrate(hdd_adapter_t *pAdapter,char *txrate) } if(ii >= SIZE_OF_TABLE(rateName_rateIndex_tbl)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Invalid Rate String\n",__func__); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Invalid Rate String", __func__); return VOS_STATUS_E_FAILURE; } @@ -3942,14 +3942,14 @@ static VOS_STATUS wlan_ftm_priv_get_channel(hdd_adapter_t *pAdapter,v_U16_t *pCh indx++; if (indx >= SIZE_OF_TABLE(freq_chan_tbl)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Invalid Frequency!!!",__func__); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Invalid Frequency!!!", __func__); status = VOS_STATUS_E_FAILURE; goto done; } *pChannel = freq_chan_tbl[indx].chan; - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Channel = %d freq = %d\n",*pChannel, freq); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "Channel = %d freq = %d", *pChannel, freq); done: return status; @@ -4199,7 +4199,7 @@ static VOS_STATUS wlan_ftm_priv_get_txrate(hdd_adapter_t *pAdapter,char *pTxRate } if(ii >= SIZE_OF_TABLE(rateName_rateIndex_tbl)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Invalid Rate Index\n",__func__); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL, "%s:Invalid Rate Index", __func__); status = VOS_STATUS_E_FAILURE; goto done; } @@ -4472,7 +4472,7 @@ static VOS_STATUS wlan_ftm_priv_set_mac_address(hdd_adapter_t *pAdapter,char *bu goto done; } - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "NV_COMMON_MAC_ADDR Success!!!\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH, "NV_COMMON_MAC_ADDR Success!!!"); init_completion(&pHddCtx->ftm.ftm_comp_var); memset( pMsgBuf,0,sizeof(tPttMsgbuffer)); @@ -4534,14 +4534,14 @@ static int iw_ftm_setchar_getnone(struct net_device *dev, struct iw_request_info { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "SET MAC ADDRESS\n"); + "SET MAC ADDRESS"); status = wlan_ftm_priv_set_mac_address(pAdapter,extra); if(status != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_FATAL, - "wlan_ftm_priv_set_mac_address Failed =%d\n",status); + "wlan_ftm_priv_set_mac_address Failed =%d", status); ret = -EINVAL; } @@ -4555,7 +4555,7 @@ static int iw_ftm_setchar_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_FATAL, - "wlan_ftm_priv_set_txrate Failed =%d\n",status); + "wlan_ftm_priv_set_txrate Failed =%d", status); ret = -EINVAL; } @@ -4564,7 +4564,7 @@ static int iw_ftm_setchar_getnone(struct net_device *dev, struct iw_request_info } default: { - hddLog(LOGE, "%s: Invalid sub command %d\n",__func__, sub_cmd); + hddLog(LOGE, "%s: Invalid sub command %d", __func__, sub_cmd); ret = -EINVAL; break; } @@ -4590,7 +4590,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"%s Failed =%d\n",__func__, status); + hddLog(VOS_TRACE_LEVEL_FATAL,"%s Failed =%d", __func__, status); ret = -EINVAL; } @@ -4602,7 +4602,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_start_stop_tx_pktgen Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_start_stop_tx_pktgen Failed =%d", status); ret = -EINVAL; } break; @@ -4612,7 +4612,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txifs Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txifs Failed =%d", status); ret = -EINVAL; } break; @@ -4622,7 +4622,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txpktcnt Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txpktcnt Failed =%d", status); ret = -EINVAL; } break; @@ -4632,7 +4632,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txpktlen Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txpktlen Failed =%d", status); ret = -EINVAL; } break; @@ -4643,7 +4643,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_channel Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_channel Failed =%d", status); ret = -EINVAL; } break; @@ -4654,7 +4654,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txpower Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_set_txpower Failed =%d", status); ret = -EINVAL; } break; @@ -4665,7 +4665,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_rx_pkt_clear Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_rx_pkt_clear Failed =%d", status); ret = -EINVAL; } break; @@ -4676,7 +4676,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_rx_mode Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_rx_mode Failed =%d", status); ret = -EINVAL; } break; @@ -4687,7 +4687,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_enable_chain Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_enable_chain Failed =%d", status); ret = -EINVAL; } break; @@ -4729,7 +4729,7 @@ static int iw_ftm_setint_getnone(struct net_device *dev, struct iw_request_info default: { - hddLog(LOGE, "Invalid IOCTL setvalue command %d value %d \n", + hddLog(LOGE, "Invalid IOCTL setvalue command %d value %d", sub_cmd, set_value); break; } @@ -4755,7 +4755,7 @@ static int iw_ftm_setnone_getint(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_get_channel Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_get_channel Failed =%d", status); ret = -EINVAL; } break; @@ -4766,7 +4766,7 @@ static int iw_ftm_setnone_getint(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_get_txpower Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_get_txpower Failed =%d", status); ret = -EINVAL; } break; @@ -4777,7 +4777,7 @@ static int iw_ftm_setnone_getint(struct net_device *dev, struct iw_request_info if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_get_rx_pkt_count Failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL,"wlan_ftm_priv_get_rx_pkt_count Failed =%d", status); ret = -EINVAL; } break; @@ -4807,7 +4807,7 @@ static int iw_ftm_get_char_setnone(struct net_device *dev, struct iw_request_inf if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_mac_address failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_mac_address failed =%d", status); return -EINVAL; } wrqu->data.length = strlen(extra)+1; @@ -4819,7 +4819,7 @@ static int iw_ftm_get_char_setnone(struct net_device *dev, struct iw_request_inf if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_txrate failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_txrate failed =%d", status); return -EINVAL; } @@ -4832,7 +4832,7 @@ static int iw_ftm_get_char_setnone(struct net_device *dev, struct iw_request_inf if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_mac_address failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_mac_address failed =%d", status); return -EINVAL; } wrqu->data.length = strlen(extra)+1; @@ -4844,7 +4844,7 @@ static int iw_ftm_get_char_setnone(struct net_device *dev, struct iw_request_inf if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_status failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_status failed =%d", status); return -EINVAL; } @@ -4857,7 +4857,7 @@ static int iw_ftm_get_char_setnone(struct net_device *dev, struct iw_request_inf if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_rx_rssi failed =%d\n",status); + hddLog(VOS_TRACE_LEVEL_FATAL, "wlan_ftm_priv_get_rx_rssi failed =%d", status); return -EINVAL; } @@ -4911,7 +4911,7 @@ VOS_STATUS wlan_write_to_efs (v_U8_t *pData, v_U16_t data_len) if(pHddCtx->ftm.cmd_iwpriv == TRUE) { 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")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!")); vos_mem_free((v_VOID_t*)wmsg); return VOS_STATUS_E_FAILURE; } @@ -4919,7 +4919,7 @@ VOS_STATUS wlan_write_to_efs (v_U8_t *pData, v_U16_t data_len) else { if( ptt_sock_send_msg_to_app(wmsg, 0, ANI_NL_MSG_PUMAC, pHddCtx->ftm.wnl->nlh.nlmsg_pid) < 0) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!\n")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Ptt Socket error sending message to the app!!")); vos_mem_free((v_VOID_t*)wmsg); return VOS_STATUS_E_FAILURE; } @@ -4945,7 +4945,7 @@ static int iw_ftm_setnone_getnone(struct net_device *dev, struct iw_request_info v_U8_t *pu8buf,*pTempBuf; v_U16_t size; size = sizeof(v_U32_t) + sizeof(sHalNv); - hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"HAL NV Size =%d\n",size); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH,"HAL NV Size =%d", size); pu8buf = vos_mem_malloc(size); if(pu8buf == NULL) { @@ -5191,7 +5191,7 @@ VOS_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) if (!cmd_data) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("Failed to allocate FTM command data\n")); + ("Failed to allocate FTM command data")); return VOS_STATUS_E_NOMEM; } @@ -5199,7 +5199,7 @@ VOS_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) if (!cmd_data->data) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("Failed to allocate FTM command data buffer\n")); + ("Failed to allocate FTM command data buffer")); vos_mem_free(cmd_data); return VOS_STATUS_E_NOMEM; } @@ -5266,7 +5266,7 @@ VOS_STATUS WLANFTM_McProcessMsg (v_VOID_t *message) if (!VOS_IS_STATUS_SUCCESS(vos_status)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: HDD vos_event_set failed!!\n")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: HDD vos_event_set failed!!")); return VOS_STATUS_E_FAILURE; } } diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index 9f6cf7262624..fa9fa632289e 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -771,7 +771,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa memset(&msg, '\0', sizeof(msg)); msg.src_addr.sa_family = ARPHRD_ETHER; memcpy(msg.src_addr.sa_data, &pSapEvent->sapevt.sapStationMICFailureEvent.staMac, sizeof(v_MACADDR_t)); - hddLog(LOG1, "MIC MAC "MAC_ADDRESS_STR"", MAC_ADDR_ARRAY(msg.src_addr.sa_data)); + hddLog(LOG1, "MIC MAC "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(msg.src_addr.sa_data)); if(pSapEvent->sapevt.sapStationMICFailureEvent.multicast == eSAP_TRUE) msg.flags = IW_MICFAILURE_GROUP; else @@ -798,7 +798,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa wrqu.addr.sa_family = ARPHRD_ETHER; memcpy(wrqu.addr.sa_data, &pSapEvent->sapevt.sapStationAssocReassocCompleteEvent.staMac, sizeof(v_MACADDR_t)); - hddLog(LOG1, " associated "MAC_ADDRESS_STR"", MAC_ADDR_ARRAY(wrqu.addr.sa_data)); + hddLog(LOG1, " associated "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); we_event = IWEVREGISTERED; #ifdef WLAN_FEATURE_MBSSID @@ -890,7 +890,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa } else { - hddLog(LOGE, FL(" Assoc Ie length is too long ")); + hddLog(LOGE, FL(" Assoc Ie length is too long")); } } #endif @@ -929,7 +929,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa case eSAP_STA_DISASSOC_EVENT: memcpy(wrqu.addr.sa_data, &pSapEvent->sapevt.sapStationDisassocCompleteEvent.staMac, sizeof(v_MACADDR_t)); - hddLog(LOG1, " disassociated "MAC_ADDRESS_STR"", MAC_ADDR_ARRAY(wrqu.addr.sa_data)); + hddLog(LOG1, " disassociated "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); if (pSapEvent->sapevt.sapStationDisassocCompleteEvent.reason == eSAP_USR_INITATED_DISASSOC) hddLog(LOG1," User initiated disassociation"); else @@ -1039,7 +1039,7 @@ VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCa pHddApCtx->WPSPBCProbeReq.probeReqIELen); vos_mem_copy(pHddApCtx->WPSPBCProbeReq.peerMacAddr, pSapEvent->sapevt.sapPBCProbeReqEvent.WPSPBCProbeReq.peerMacAddr, sizeof(v_MACADDR_t)); - hddLog(LOG1, "WPS PBC probe req "MAC_ADDRESS_STR"", MAC_ADDR_ARRAY(pHddApCtx->WPSPBCProbeReq.peerMacAddr)); + hddLog(LOG1, "WPS PBC probe req "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pHddApCtx->WPSPBCProbeReq.peerMacAddr)); memset(&wreq, 0, sizeof(wreq)); wreq.data.length = strlen(message); // This is length of message wireless_send_event(dev, IWEVCUSTOM, &wreq, (char *)message); @@ -2653,15 +2653,17 @@ static iw_softap_commit(struct net_device *dev, pConfig->obssProtEnabled = (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->apOBSSProtEnabled; (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->apDisableIntraBssFwd = (WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->apDisableIntraBssFwd; - hddLog(LOGW, FL("SOftAP macaddress : "MAC_ADDRESS_STR""), MAC_ADDR_ARRAY(pHostapdAdapter->macAddressCurrent.bytes)); - hddLog(LOGW,FL("ssid =%s"), pConfig->SSIDinfo.ssid.ssId); - hddLog(LOGW,FL("beaconint=%d, channel=%d"), (int)pConfig->beacon_int, (int)pConfig->channel); - hddLog(LOGW,FL("hw_mode=%x"), pConfig->SapHw_mode); - hddLog(LOGW,FL("privacy=%d, authType=%d"), pConfig->privacy, pConfig->authType); - hddLog(LOGW,FL("RSN/WPALen=%d"),(int)pConfig->RSNWPAReqIELength); - hddLog(LOGW,FL("Uapsd = %d"),pConfig->UapsdEnable); - hddLog(LOGW,FL("ProtEnabled = %d, OBSSProtEnabled = %d"),pConfig->protEnabled, pConfig->obssProtEnabled); - hddLog(LOGW,FL("DisableIntraBssFwd = %d"),(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->apDisableIntraBssFwd); + hddLog(LOGW, FL("SOftAP macaddress : "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHostapdAdapter->macAddressCurrent.bytes)); + hddLog(LOGW,FL("ssid =%s, beaconint=%d, channel=%d"), + pConfig->SSIDinfo.ssid.ssId, + (int)pConfig->beacon_int, (int)pConfig->channel); + hddLog(LOGW,FL("hw_mode=%x, privacy=%d, authType=%d"), + pConfig->SapHw_mode, pConfig->privacy, pConfig->authType); + hddLog(LOGW,FL("RSN/WPALen=%d, Uapsd = %d"), + (int)pConfig->RSNWPAReqIELength, pConfig->UapsdEnable); + hddLog(LOGW,FL("ProtEnabled = %d, OBSSProtEnabled = %d, DisableIntraBssFwd = %d"), + pConfig->protEnabled, pConfig->obssProtEnabled, + (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->apDisableIntraBssFwd); pSapEventCallback = hdd_hostapd_SAPEventCB; pConfig->persona = pHostapdAdapter->device_mode; @@ -2803,7 +2805,7 @@ int iw_softap_get_channel_list(struct net_device *dev, bandEndChannel = RF_CHAN_165; } - hddLog(LOG1, FL("\n curBand = %d, bandStartChannel = %hu, " + hddLog(LOG1, FL("curBand = %d, bandStartChannel = %hu, " "bandEndChannel = %hu "), curBand, bandStartChannel, bandEndChannel ); @@ -2822,7 +2824,7 @@ int iw_softap_get_channel_list(struct net_device *dev, if(eHAL_STATUS_SUCCESS != sme_getSoftApDomain(hHal,(v_REGDOMAIN_t *) &domainIdCurrentSoftap)) { - hddLog(LOG1,FL("Failed to get Domain ID, %d "),domainIdCurrentSoftap); + hddLog(LOG1,FL("Failed to get Domain ID, %d"),domainIdCurrentSoftap); return -EIO; } @@ -2926,7 +2928,7 @@ int iw_get_WPSPBCProbeReqIEs(struct net_device *dev, return -EFAULT; } wrqu->data.length = 12 + WPSPBCProbeReqIEs.probeReqIELen; - hddLog(LOG1, FL("Macaddress : "MAC_ADDRESS_STR""), + hddLog(LOG1, FL("Macaddress : "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(WPSPBCProbeReqIEs.macaddr)); up(&pHddApCtx->semWpsPBCOverlapInd); EXIT(); @@ -3044,9 +3046,9 @@ static int iw_set_ap_encodeext(struct net_device *dev, RemoveKey.encType = eCSR_ENCRYPT_TYPE_NONE; break; } - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Remove key cipher_alg:%d key_len%d *pEncryptionType :%d ", + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Remove key cipher_alg:%d key_len%d *pEncryptionType :%d", __func__,(int)ext->alg,(int)ext->key_len,RemoveKey.encType); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Peer Mac = "MAC_ADDRESS_STR"", + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: Peer Mac = "MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(RemoveKey.peerMac)); ); #ifdef WLAN_FEATURE_MBSSID @@ -3202,7 +3204,7 @@ static int iw_set_ap_mlme(struct net_device *dev, //clear all the reason codes if (status != 0) { - hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d ", __func__, (int)mlme->cmd, (int)status ); + hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d", __func__, (int)mlme->cmd, (int)status ); } netif_stop_queue(dev); @@ -3210,10 +3212,10 @@ static int iw_set_ap_mlme(struct net_device *dev, } else { - hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state ", __func__, (int)mlme->cmd ); + hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state", __func__, (int)mlme->cmd ); } default: - hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate ", __func__, (int)mlme->cmd ); + hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate", __func__, (int)mlme->cmd ); return -EINVAL; }//end of switch EXIT(); diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c index b4c35b1b905e..a57a5531e7e6 100644 --- a/CORE/HDD/src/wlan_hdd_ipa.c +++ b/CORE/HDD/src/wlan_hdd_ipa.c @@ -816,7 +816,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, iface_id = HDD_IPA_GET_IFACE_ID(skb->data); if (iface_id >= HDD_IPA_MAX_IFACE) { HDD_IPA_LOG(VOS_TRACE_LEVEL_ERROR, - "IPA_RECEIVE: Invalid iface_id: %u\n", + "IPA_RECEIVE: Invalid iface_id: %u", iface_id); adf_nbuf_free(skb); return; @@ -1484,7 +1484,7 @@ static int hdd_ipa_rx_pipe_desc_alloc(void) ret = -ENOMEM; HDD_IPA_LOG(VOS_TRACE_LEVEL_ERROR, - "Descriptor allocation failed\n"); + "Descriptor allocation failed"); goto fail; } spin_lock_bh(&hdd_ipa->q_lock); diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index b383e62e2fdf..fd0735a29326 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -2882,7 +2882,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) (WLAN_HDD_INFRA_STATION != pAdapter->device_mode)) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: Received SETMCRATE command in invalid mode %d \n" + "%s: Received SETMCRATE command in invalid mode %d" "SETMCRATE command is only allowed in STA, IBSS or SOFTAP mode", __func__, pAdapter->device_mode); return -EINVAL; @@ -4585,7 +4585,7 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter, (WLAN_HDD_SOFTAP != pAdapter->device_mode)) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "Received SETRMCTXRATE command in invalid mode %d \n" + "Received SETRMCTXRATE command in invalid mode %d" "SETRMC command is only allowed in IBSS or SOFTAP mode", pAdapter->device_mode); ret = -EINVAL; @@ -4735,15 +4735,15 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter, } VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "UplinkPktQueueDly(%d)\n" - "UplinkPktQueueDlyHist[0](%d)\n" - "UplinkPktQueueDlyHist[1](%d)\n" - "UplinkPktQueueDlyHist[2](%d)\n" - "UplinkPktQueueDlyHist[3](%d)\n" - "UplinkPktTxDly(%u)\n" - "UplinkPktLoss(%d)\n" - "UplinkPktCount(%d)\n" - "RoamingCount(%d)\n" + "UplinkPktQueueDly(%d)" + "UplinkPktQueueDlyHist[0](%d)" + "UplinkPktQueueDlyHist[1](%d)" + "UplinkPktQueueDlyHist[2](%d)" + "UplinkPktQueueDlyHist[3](%d)" + "UplinkPktTxDly(%u)" + "UplinkPktLoss(%d)" + "UplinkPktCount(%d)" + "RoamingCount(%d)" "RoamingDly(%d)", tsmMetrics.UplinkPktQueueDly, tsmMetrics.UplinkPktQueueDlyHist[0], @@ -6820,7 +6820,7 @@ void hdd_req_bmps_cbk(void *callbackContext, eHalStatus status) struct completion *completion_var = (struct completion*) callbackContext; - hddLog(VOS_TRACE_LEVEL_ERROR, "HDD BMPS request Callback, status = %d\n", status); + hddLog(VOS_TRACE_LEVEL_ERROR, "HDD BMPS request Callback, status = %d", status); if(completion_var != NULL) { complete(completion_var); @@ -7353,7 +7353,7 @@ void hdd_cleanup_actionframe( hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter ) if(!rc) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - ("ERROR: HDD Wait for Action Confirmation Failed!!\n")); + ("ERROR: HDD Wait for Action Confirmation Failed!!")); } } return; @@ -7642,7 +7642,7 @@ VOS_STATUS hdd_disable_bmps_imps(hdd_context_t *pHddCtx, tANI_U8 session_type) if(eHAL_STATUS_SUCCESS != halStatus) { status = VOS_STATUS_E_FAILURE; - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Fail to Disable Power Save\n", __func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Fail to Disable Power Save", __func__); VOS_ASSERT(0); return status; } @@ -7655,7 +7655,7 @@ VOS_STATUS hdd_disable_bmps_imps(hdd_context_t *pHddCtx, tANI_U8 session_type) if(eHAL_STATUS_SUCCESS != halStatus) { status = VOS_STATUS_E_FAILURE; - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Fail to Stop Auto Bmps Timer\n", __func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Fail to Stop Auto Bmps Timer", __func__); VOS_ASSERT(0); return status; } @@ -7681,7 +7681,7 @@ VOS_STATUS hdd_disable_bmps_imps(hdd_context_t *pHddCtx, tANI_U8 session_type) else { status = VOS_STATUS_E_FAILURE; - hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Request for Full Power failed\n", __func__); + hddLog(VOS_TRACE_LEVEL_ERROR,"%s: Request for Full Power failed", __func__); VOS_ASSERT(0); return status; } @@ -8115,7 +8115,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t* pHostapdAdapter) eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA1 to CCM\n"); + "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA1 to CCM"); } if ( eHAL_STATUS_FAILURE == ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal, @@ -8123,7 +8123,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t* pHostapdAdapter) eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA2 to CCM\n"); + "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA2 to CCM"); } if ( eHAL_STATUS_FAILURE == ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal, @@ -8131,7 +8131,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t* pHostapdAdapter) eANI_BOOLEAN_FALSE) ) { hddLog(LOGE, - "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA3 to CCM\n"); + "Could not pass on WNI_CFG_PROBE_RSP_ADDNIE_DATA3 to CCM"); } } @@ -9019,7 +9019,7 @@ static void hdd_set_multicast_list(struct net_device *dev) break; memset(&(pAdapter->mc_addr_list.addr[i][0]), 0, ETH_ALEN); memcpy(&(pAdapter->mc_addr_list.addr[i][0]), ha->addr, ETH_ALEN); - hddLog(VOS_TRACE_LEVEL_INFO, "\n%s: mlist[%d] = "MAC_ADDRESS_STR, + hddLog(VOS_TRACE_LEVEL_INFO, "%s: mlist[%d] = "MAC_ADDRESS_STR, __func__, i, MAC_ADDR_ARRAY(pAdapter->mc_addr_list.addr[i])); i++; @@ -9462,12 +9462,12 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx) * exited at this point */ hddLog(VOS_TRACE_LEVEL_WARN, "In module exit: Cancel the vote for XO Core ON" - " when WLAN is turned OFF\n"); + " when WLAN is turned OFF"); if (vos_chipVoteXOCore(NULL, NULL, NULL, VOS_FALSE) != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_ERROR, "Could not cancel the vote for XO Core ON." " Not returning failure." - " Power consumed will be high\n"); + " Power consumed will be high"); } hdd_close_all_adapters( pHddCtx ); @@ -9589,7 +9589,7 @@ int hdd_wlan_notify_modem_power_state(int state) vosStatus = sme_notify_modem_power_state(pHddCtx->hHal, state); if (VOS_STATUS_SUCCESS != vosStatus) { - hddLog(LOGE, "Fail to send notification with modem power state %d\n", + hddLog(LOGE, "Fail to send notification with modem power state %d", state); return -1; } @@ -9617,20 +9617,20 @@ static VOS_STATUS hdd_update_config_from_nv(hdd_context_t* pHddCtx) status = vos_nv_getValidity(VNV_FIELD_IMAGE, &itemIsValid); if(status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_ERROR," vos_nv_getValidity() failed\n "); + hddLog(VOS_TRACE_LEVEL_ERROR," vos_nv_getValidity() failed"); return VOS_STATUS_E_FAILURE; } if (itemIsValid == VOS_TRUE) { - hddLog(VOS_TRACE_LEVEL_INFO_HIGH," Reading the Macaddress from NV\n "); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH," Reading the Macaddress from NV"); status = vos_nv_readMultiMacAddress((v_U8_t *)&macFromNV[0].bytes[0], VOS_MAX_CONCURRENCY_PERSONA); if(status != VOS_STATUS_SUCCESS) { /* Get MAC from NV fail, not update CFG info * INI MAC value will be used for MAC setting */ - hddLog(VOS_TRACE_LEVEL_ERROR," vos_nv_readMacAddress() failed\n "); + hddLog(VOS_TRACE_LEVEL_ERROR," vos_nv_readMacAddress() failed"); return VOS_STATUS_E_FAILURE; } @@ -10822,7 +10822,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) VOS_TIMER_TYPE_SW, wlan_hdd_auto_shutdown_cb, NULL); if (!VOS_IS_STATUS_SUCCESS(status)) - hddLog(LOGE, FL("Failed to init wlan auto shutdown timer\n")); + hddLog(LOGE, FL("Failed to init wlan auto shutdown timer")); } #endif @@ -11137,7 +11137,7 @@ static int hdd_driver_init( void) if (vos_chipVoteXOCore(NULL, NULL, NULL, VOS_FALSE) != VOS_STATUS_SUCCESS) { hddLog(VOS_TRACE_LEVEL_ERROR, "Could not cancel XO Core ON vote. Not returning failure." - " Power consumed will be high\n"); + " Power consumed will be high"); } } while (0); @@ -12072,7 +12072,7 @@ void wlan_hdd_send_svc_nlink_msg(int type) #endif default: VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "WLAN SVC: Attempt to send unknown nlink message %d\n", type); + "WLAN SVC: Attempt to send unknown nlink message %d", type); kfree_skb(skb); return; } diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c index b414b70c9fc9..71699cca137e 100644 --- a/CORE/HDD/src/wlan_hdd_oemdata.c +++ b/CORE/HDD/src/wlan_hdd_oemdata.c @@ -78,12 +78,12 @@ static eHalStatus hdd_OemDataReqCallback(tHalHandle hHal, if(oemDataReqStatus == eOEM_DATA_REQ_FAILURE) { snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-FAILED"); - hddLog(LOGW, "%s: oem data req %d failed\n", __func__, oemDataReqID); + hddLog(LOGW, "%s: oem data req %d failed", __func__, oemDataReqID); } else if(oemDataReqStatus == eOEM_DATA_REQ_INVALID_MODE) { snprintf(buffer, IW_CUSTOM_MAX, "QCOM: OEM-DATA-REQ-INVALID-MODE"); - hddLog(LOGW, "%s: oem data req %d failed because the driver is in invalid mode (IBSS|BTAMP|AP)\n", __func__, oemDataReqID); + hddLog(LOGW, "%s: oem data req %d failed because the driver is in invalid mode (IBSS|BTAMP|AP)", __func__, oemDataReqID); } else { @@ -140,7 +140,7 @@ int iw_get_oem_data_rsp( status = sme_getOemDataRsp(WLAN_HDD_GET_HAL_CTX(pAdapter), &pSmeOemDataRsp); if(status != eHAL_STATUS_SUCCESS) { - hddLog(LOGE, "%s: failed in sme_getOemDataRsp\n", __func__); + hddLog(LOGE, "%s: failed in sme_getOemDataRsp", __func__); break; } else @@ -152,7 +152,7 @@ int iw_get_oem_data_rsp( } else { - hddLog(LOGE, "%s: pSmeOemDataRsp = NULL\n", __func__); + hddLog(LOGE, "%s: pSmeOemDataRsp = NULL", __func__); status = eHAL_STATUS_FAILURE; break; } @@ -209,7 +209,7 @@ int iw_set_oem_data_req( if(pOemDataReq == NULL) { - hddLog(LOGE, "in %s oemDataReq == NULL\n", __func__); + hddLog(LOGE, "in %s oemDataReq == NULL", __func__); status = eHAL_STATUS_FAILURE; break; } diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c index 3b2ff3abc6ac..b37a8f94a3c9 100644 --- a/CORE/HDD/src/wlan_hdd_p2p.c +++ b/CORE/HDD/src/wlan_hdd_p2p.c @@ -1083,16 +1083,16 @@ int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, (buf[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET] == WLAN_HDD_PUBLIC_ACTION_FRAME)) { actionFrmType = buf[WLAN_HDD_PUBLIC_ACTION_FRAME_TYPE_OFFSET]; - hddLog(LOG1, "Tx Action Frame %u \n", actionFrmType); + hddLog(LOG1, "Tx Action Frame %u", actionFrmType); if (actionFrmType == WLAN_HDD_PROV_DIS_REQ) { cfgState->actionFrmState = HDD_PD_REQ_ACK_PENDING; - hddLog(LOG1, "%s: HDD_PD_REQ_ACK_PENDING \n", __func__); + hddLog(LOG1, "%s: HDD_PD_REQ_ACK_PENDING", __func__); } else if (actionFrmType == WLAN_HDD_GO_NEG_REQ) { cfgState->actionFrmState = HDD_GO_NEG_REQ_ACK_PENDING; - hddLog(LOG1, "%s: HDD_GO_NEG_REQ_ACK_PENDING \n", __func__); + hddLog(LOG1, "%s: HDD_GO_NEG_REQ_ACK_PENDING", __func__); } } #ifdef WLAN_FEATURE_11W @@ -1264,7 +1264,7 @@ int hdd_setP2pNoa( struct net_device *dev, tANI_U8 *command ) param++; sscanf(param, "%d %d %d", &count, &start_time, &duration); VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: P2P_SET GO NoA: count=%d duration=%d interval=%d \n", + "%s: P2P_SET GO NoA: count=%d duration=%d interval=%d", __func__, count, start_time, duration); duration = MS_TO_MUS(duration); /* PS Selection @@ -1292,7 +1292,7 @@ int hdd_setP2pNoa( struct net_device *dev, tANI_U8 *command ) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " - "PsSelection %x \n", __func__, NoA.opp_ps, + "PsSelection %x", __func__, NoA.opp_ps, NoA.ctWindow, NoA.duration, NoA.interval, NoA.count, NoA.single_noa_duration, NoA.psSelection); @@ -1337,7 +1337,7 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) param++; sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow); VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d \n", + "%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d", __func__, legacy_ps, opp_ps, ctwindow); /* PS Selection @@ -1356,7 +1356,7 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) { VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "Opportunistic Power Save is %s \n", + "Opportunistic Power Save is %s", (TRUE == pAdapter->ops) ? "Enable" : "Disable" ); if (ctwindow != pAdapter->ctw) @@ -1377,7 +1377,7 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " - "PsSelection %x \n", __func__, NoA.opp_ps, + "PsSelection %x", __func__, NoA.opp_ps, NoA.ctWindow, NoA.duration, NoA.interval, NoA.count, NoA.single_noa_duration, NoA.psSelection); @@ -1407,7 +1407,7 @@ int hdd_setP2pOpps( struct net_device *dev, tANI_U8 *command ) VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " - "PsSelection %x \n", __func__, NoA.opp_ps, + "PsSelection %x", __func__, NoA.opp_ps, NoA.ctWindow, NoA.duration, NoA.interval, NoA.count, NoA.single_noa_duration, NoA.psSelection); @@ -1686,7 +1686,7 @@ void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter, VOS_STATUS status; hdd_remain_on_chan_ctx_t* pRemainChanCtx = NULL; - hddLog(VOS_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d", __func__, frameType, nFrameLength); if (NULL == pAdapter) @@ -1725,7 +1725,8 @@ void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter, MAC_ADDRESS_STR , MAC_ADDR_ARRAY(&pbFrames[WLAN_HDD_80211_FRM_DA_OFFSET])); hddLog(VOS_TRACE_LEVEL_FATAL, "%s: Frame Type = %d Frame Length = %d" - " subType = %d \n",__func__,frameType,nFrameLength,subType); + " subType = %d", __func__, frameType, + nFrameLength, subType); return; } } @@ -1784,7 +1785,7 @@ void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter, // P2P action frames { actionFrmType = pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_TYPE_OFFSET]; - hddLog(LOG1, "Rx Action Frame %u \n", actionFrmType); + hddLog(LOG1, "Rx Action Frame %u", actionFrmType); #ifdef WLAN_FEATURE_P2P_DEBUG if(actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) { diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c index ebb3439ab8c2..6af9fab09ffe 100644 --- a/CORE/HDD/src/wlan_hdd_scan.c +++ b/CORE/HDD/src/wlan_hdd_scan.c @@ -1001,7 +1001,7 @@ int iw_set_cscan(struct net_device *dev, struct iw_request_info *info, /* get the ssid length */ SsidInfo->SSID.length = str_ptr[ssid_start++]; vos_mem_copy(SsidInfo->SSID.ssId, &str_ptr[ssid_start], SsidInfo->SSID.length); - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "SSID number %d: %s\n", j, SsidInfo->SSID.ssId); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "SSID number %d: %s", j, SsidInfo->SSID.ssId); } /* skipping length */ ssid_start += str_ptr[ssid_start - 1] + 1; diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c index df0d85e5f2a8..6ad7102cdd72 100644 --- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c +++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c @@ -73,12 +73,12 @@ static void hdd_softap_dump_sk_buff(struct sk_buff * skb) VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: end = %p ", __func__, skb->end); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: len = %d ", __func__, skb->len); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: data_len = %d ", __func__, skb->data_len); - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d\n", __func__, skb->mac_len); + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"%s: mac_len = %d", __func__, skb->mac_len); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5], skb->data[6], skb->data[7]); - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x \n", + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_ERROR,"0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", skb->data[8], skb->data[9], skb->data[10], skb->data[11], skb->data[12], skb->data[13], skb->data[14], skb->data[15]); } @@ -301,7 +301,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) skb->queue_mapping = HDD_LINUX_AC_BE; VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, - "%s: BC/MC packet\n", __func__); + "%s: BC/MC packet", __func__); } else { @@ -365,7 +365,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if(pktListSize >= pAdapter->aTxQueueLimit[ac]) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, - "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize); + "%s: station %d ac %d queue over limit %d", __func__, STAId, ac, pktListSize); pAdapter->aStaInfo[STAId].txSuspended[ac] = VOS_TRUE; netif_stop_subqueue(dev, skb_get_queue_mapping(skb)); txSuspended = VOS_TRUE; @@ -450,7 +450,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) } dev->trans_start = jiffies; - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __func__); + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit", __func__); xmit_done: spin_unlock_bh( &pAdapter->staInfo_lock ); @@ -677,7 +677,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __func__); + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit", __func__); return NETDEV_TX_OK; @@ -757,7 +757,7 @@ VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, pktListSize >= pAdapter->aTxQueueLimit[ac]) { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN, - "%s: station %d ac %d queue over limit %d \n", __func__, STAId, ac, pktListSize); + "%s: station %d ac %d queue over limit %d", __func__, STAId, ac, pktListSize); /* TODO:Rx Flowchart should be trigerred here to SUPEND SSC on RX side. * SUSPEND should be done based on Threshold. RESUME would be * triggered in fetch cbk after recovery. @@ -809,7 +809,7 @@ VOS_STATUS hdd_softap_sta_2_sta_xmit(struct sk_buff *skb, } } - VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit \n", __func__); + VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, "%s: exit", __func__); xmit_end: spin_unlock_bh( &pAdapter->staInfo_lock ); @@ -1601,7 +1601,7 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, if(skb->dev == NULL) { - hddLog(VOS_TRACE_LEVEL_FATAL, "ERROR!!Invalid netdevice\n"); + hddLog(VOS_TRACE_LEVEL_FATAL, "ERROR!!Invalid netdevice"); return VOS_STATUS_E_FAILURE; } ++pAdapter->hdd_stats.hddTxRxStats.rxPackets; @@ -1640,7 +1640,7 @@ VOS_STATUS hdd_softap_rx_packet_cbk( v_VOID_t *vosContext, #endif { VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, - "%s: send one packet to kernel \n", __func__); + "%s: send one packet to kernel", __func__); skb->protocol = eth_type_trans(skb, skb->dev); skb->ip_summed = CHECKSUM_NONE; @@ -1742,7 +1742,7 @@ VOS_STATUS hdd_softap_rx_packet_cbk(v_VOID_t *vosContext, if (skb->dev == NULL) { - hddLog(VOS_TRACE_LEVEL_FATAL, "ERROR!!Invalid netdevice\n"); + hddLog(VOS_TRACE_LEVEL_FATAL, "ERROR!!Invalid netdevice"); return VOS_STATUS_E_FAILURE; } ++pAdapter->hdd_stats.hddTxRxStats.rxPackets; @@ -1767,7 +1767,7 @@ VOS_STATUS hdd_softap_rx_packet_cbk(v_VOID_t *vosContext, #endif /* QCA_PKT_PROTO_TRACE */ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO_LOW, - "%s: send one packet to kernel \n", __func__); + "%s: send one packet to kernel", __func__); skb->protocol = eth_type_trans(skb, skb->dev); #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK @@ -1933,7 +1933,7 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, vos_copy_macaddr( &staDesc.vSelfMACAddress, &pAdapter->macAddressCurrent ); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, - "register station \n"); + "register station"); VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, "station mac " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(staDesc.vSTAMACAddress.bytes)); @@ -2041,7 +2041,7 @@ VOS_STATUS hdd_softap_RegisterSTA( hdd_adapter_t *pAdapter, pmonAdapter= hdd_get_mon_adapter( pAdapter->pHddCtx); if(pmonAdapter) { - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Turn on Monitor the carrier\n"); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Turn on Monitor the carrier"); netif_carrier_on(pmonAdapter->dev); //Enable Tx queue netif_tx_start_all_queues(pmonAdapter->dev); @@ -2150,7 +2150,7 @@ VOS_STATUS hdd_softap_change_STA_state( hdd_adapter_t *pAdapter, v_MACADDR_t *pD } VOS_TRACE(VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_INFO, - "%s exit\n",__func__); + "%s exit", __func__); return vosStatus; } diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c index e94369696743..da64cd93de2a 100644 --- a/CORE/HDD/src/wlan_hdd_tdls.c +++ b/CORE/HDD/src/wlan_hdd_tdls.c @@ -447,7 +447,7 @@ static v_VOID_t wlan_hdd_tdls_idle_cb( v_PVOID_t userData ) VOS_TRACE(VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, - "%s: Tx/Rx Idle " MAC_ADDRESS_STR " tx_pkt: %d, rx_pkt: %d, idle_packet_n: %d\n", + "%s: Tx/Rx Idle " MAC_ADDRESS_STR " tx_pkt: %d, rx_pkt: %d, idle_packet_n: %d", __func__, MAC_ADDR_ARRAY(curr_peer->peerMac), curr_peer->tx_pkt, curr_peer->rx_pkt, @@ -2082,7 +2082,7 @@ static void wlan_hdd_tdls_pre_setup(struct work_struct *work) temp_peer = wlan_hdd_tdls_is_progress(pHddCtx, NULL, 0); if (NULL != temp_peer) { - VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, "%s: " MAC_ADDRESS_STR " ongoing. pre_setup ignored\n", + VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, "%s: " MAC_ADDRESS_STR " ongoing. pre_setup ignored", __func__, MAC_ADDR_ARRAY(temp_peer->peerMac)); goto done; } @@ -2112,7 +2112,7 @@ static void wlan_hdd_tdls_pre_setup(struct work_struct *work) if (0 != status) { - VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, "%s: " MAC_ADDRESS_STR " discovery could not sent\n", + VOS_TRACE( VOS_MODULE_ID_HDD, TDLS_LOG_LEVEL, "%s: " MAC_ADDRESS_STR " discovery could not sent", __func__, MAC_ADDR_ARRAY(curr_peer->peerMac)); if (eTDLS_CAP_UNKNOWN != curr_peer->tdls_support) curr_peer->link_status = eTDLS_LINK_IDLE; diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index 8daea13d1c18..199d85bd378c 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -490,7 +490,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { {2412, 1}, {2417, 2}, } \ else \ { \ - hddLog(VOS_TRACE_LEVEL_ERROR, "FILL_TLV Failed!!!\n"); \ + hddLog(VOS_TRACE_LEVEL_ERROR, "FILL_TLV Failed!!!"); \ } \ } while(0); @@ -711,7 +711,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) wrqu->rts.value = threshold; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - ("Rts-Threshold=%d!!\n"), wrqu->rts.value); + ("Rts-Threshold=%d!!"), wrqu->rts.value); EXIT(); @@ -740,7 +740,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) wrqu->frag.value = threshold; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - ("Frag-Threshold=%d!!\n"), wrqu->frag.value); + ("Frag-Threshold=%d!!"), wrqu->frag.value); EXIT(); @@ -762,7 +762,7 @@ int hdd_wlan_get_freq(v_U32_t channel, v_U32_t *pfreq) } } VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - ("Invalid channel no=%d!!\n"), channel); + ("Invalid channel no=%d!!"), channel); return -EINVAL; } @@ -817,12 +817,12 @@ hdd_IsAuthTypeRSN( tHalHandle halHandle, eCsrAuthType authType) rsnType = eANI_BOOLEAN_FALSE; break; default: - hddLog(LOGE, FL("%s called with unknown authType - default to Open, None\n"), - __func__); + hddLog(LOGE, FL("%s called with unknown authType - default to Open, None"), + __func__); rsnType = eANI_BOOLEAN_FALSE; break; } - hddLog(LOGE, FL("%s called with authType: %d, returned: %d\n"), + hddLog(LOGE, FL("%s called with authType: %d, returned: %d"), __func__, authType, rsnType); return rsnType; } @@ -1482,7 +1482,7 @@ v_U8_t* wlan_hdd_get_vendor_oui_ie_ptr(v_U8_t *oui, v_U8_t oui_size, v_U8_t *ie, static int iw_set_commit(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - hddLog( LOG1, "In %s\n", __func__); + hddLog( LOG1, "In %s", __func__); /* Do nothing for now */ return 0; } @@ -1628,20 +1628,20 @@ static int iw_get_mode(struct net_device *dev, switch (pWextState->roamProfile.BSSType) { case eCSR_BSS_TYPE_INFRASTRUCTURE: - hddLog(LOG1, "%s returns IW_MODE_INFRA\n", __func__); + hddLog(LOG1, "%s returns IW_MODE_INFRA", __func__); wrqu->mode = IW_MODE_INFRA; break; case eCSR_BSS_TYPE_IBSS: case eCSR_BSS_TYPE_START_IBSS: - hddLog(LOG1, "%s returns IW_MODE_ADHOC\n", __func__); + hddLog(LOG1, "%s returns IW_MODE_ADHOC", __func__); wrqu->mode = IW_MODE_ADHOC; break; case eCSR_BSS_TYPE_ANY: - hddLog(LOG1, "%s returns IW_MODE_AUTO\n", __func__); + hddLog(LOG1, "%s returns IW_MODE_AUTO", __func__); wrqu->mode = IW_MODE_AUTO; break; default: - hddLog(LOG1, "%s returns APMODE_UNKNOWN\n", __func__); + hddLog(LOG1, "%s returns APMODE_UNKNOWN", __func__); break; } @@ -1672,13 +1672,13 @@ static int iw_set_freq(struct net_device *dev, struct iw_request_info *info, pRoamProfile = &pWextState->roamProfile; - hddLog(LOG1,"setCHANNEL ioctl\n"); + hddLog(LOG1,"setCHANNEL ioctl"); /* Link is up then return cant set channel*/ if(eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState || eConnectionState_Associated == pHddStaCtx->conn_info.connState) { - hddLog( LOGE, "IBSS Associated\n"); + hddLog( LOGE, "IBSS Associated"); return -EOPNOTSUPP; } @@ -1704,7 +1704,7 @@ static int iw_set_freq(struct net_device *dev, struct iw_request_info *info, if((wrqu->freq.m < WNI_CFG_CURRENT_CHANNEL_STAMIN) || (wrqu->freq.m > WNI_CFG_CURRENT_CHANNEL_STAMAX)) { - hddLog(LOG1,"%s: Channel [%d] is outside valid range from %d to %d\n", + hddLog(LOG1,"%s: Channel [%d] is outside valid range from %d to %d", __func__, wrqu->freq.m, WNI_CFG_CURRENT_CHANNEL_STAMIN, WNI_CFG_CURRENT_CHANNEL_STAMAX); return -EINVAL; @@ -1740,7 +1740,7 @@ static int iw_set_freq(struct net_device *dev, struct iw_request_info *info, pHddStaCtx->conn_info.operationChannel = wrqu->freq.m; pRoamProfile->ChannelInfo.ChannelList = &pHddStaCtx->conn_info.operationChannel; - hddLog(LOG1,"pRoamProfile->operationChannel = %d\n", wrqu->freq.m); + hddLog(LOG1,"pRoamProfile->operationChannel = %d", wrqu->freq.m); EXIT(); @@ -2031,7 +2031,7 @@ static int iw_set_genie(struct net_device *dev, remLen = wrqu->data.length; - hddLog(LOG1,"iw_set_genie ioctl IE[0x%X], LEN[%d]\n", genie[0], genie[1]); + hddLog(LOG1,"iw_set_genie ioctl IE[0x%X], LEN[%d]", genie[0], genie[1]); /* clear any previous genIE before this call */ memset( &pWextState->genIE, 0, sizeof(pWextState->genIE) ); @@ -2044,7 +2044,7 @@ static int iw_set_genie(struct net_device *dev, eLen = *genie++; remLen -= 2; - hddLog(VOS_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]\n", + hddLog(VOS_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]", __func__, elementId, eLen); switch ( elementId ) @@ -2065,7 +2065,7 @@ static int iw_set_genie(struct net_device *dev, if( SIR_MAC_MAX_IE_LENGTH < (pWextState->genIE.length + eLen) ) { hddLog(VOS_TRACE_LEVEL_FATAL, "Cannot accommodate genIE. " - "Need bigger buffer space\n"); + "Need bigger buffer space"); VOS_ASSERT(0); kfree(base_genie); return -ENOMEM; @@ -2091,7 +2091,7 @@ static int iw_set_genie(struct net_device *dev, if( SIR_MAC_MAX_IE_LENGTH < (pWextState->genIE.length + eLen) ) { hddLog(VOS_TRACE_LEVEL_FATAL, "Cannot accommodate genIE. " - "Need bigger buffer space\n"); + "Need bigger buffer space"); VOS_ASSERT(0); kfree(base_genie); return -ENOMEM; @@ -2142,7 +2142,7 @@ static int iw_get_genie(struct net_device *dev, } - hddLog(LOG1,"getGEN_IE ioctl\n"); + hddLog(LOG1,"getGEN_IE ioctl"); pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); @@ -2172,7 +2172,7 @@ static int iw_get_genie(struct net_device *dev, vos_mem_copy( extra, (v_VOID_t*)genIeBytes, length); wrqu->data.length = length; - hddLog(LOG1,"%s: RSN IE of %d bytes returned\n", __func__, wrqu->data.length ); + hddLog(LOG1,"%s: RSN IE of %d bytes returned", __func__, wrqu->data.length ); EXIT(); @@ -2201,7 +2201,7 @@ static int iw_get_encode(struct net_device *dev, if(keyId < 0 || keyId >= MAX_WEP_KEYS) { - hddLog(LOG1,"%s: Invalid keyId : %d\n",__func__,keyId); + hddLog(LOG1,"%s: Invalid keyId : %d", __func__, keyId); return -EINVAL; } @@ -2570,7 +2570,7 @@ void hdd_tx_per_hit_cb (void *pCallbackContext) if (NULL == pAdapter) { - hddLog(LOGE, "hdd_tx_per_hit_cb: pAdapter is NULL\n"); + hddLog(LOGE, "hdd_tx_per_hit_cb: pAdapter is NULL"); return; } memset(&wrqu, 0, sizeof(wrqu)); @@ -3226,7 +3226,7 @@ VOS_STATUS wlan_hdd_enter_lowpower(hdd_context_t *pHddCtx) { //Execute deep sleep procedure hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Wlan driver entering " - "deep sleep mode\n"); + "deep sleep mode"); //Deep sleep not supported vos_Status = hdd_enter_standby(pHddCtx); } @@ -3303,7 +3303,7 @@ static int iw_set_priv(struct net_device *dev, } else if( strcasecmp(cmd, "start") == 0 ) { - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Start command\n"); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Start command"); /*Exit from Deep sleep or standby if we get the driver START cmd from android GUI*/ vos_status = wlan_hdd_exit_lowpower(pHddCtx, pAdapter); @@ -3328,7 +3328,7 @@ static int iw_set_priv(struct net_device *dev, union iwreq_data wrqu; char buf[10]; - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Stop command\n"); + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "Stop command"); wlan_hdd_enter_lowpower(pHddCtx); memset(&wrqu, 0, sizeof(wrqu)); @@ -3442,39 +3442,39 @@ static int iw_set_priv(struct net_device *dev, ret = snprintf(cmd, cmd_len, "powermode = %u", value); } else if( strncasecmp(cmd, "btcoexmode", 10) == 0 ) { - hddLog( VOS_TRACE_LEVEL_INFO, "btcoexmode\n"); + hddLog( VOS_TRACE_LEVEL_INFO, "btcoexmode"); /*TODO: set the btcoexmode*/ } else if( strcasecmp(cmd, "btcoexstat") == 0 ) { - hddLog(VOS_TRACE_LEVEL_INFO, "BtCoex Status\n"); + hddLog(VOS_TRACE_LEVEL_INFO, "BtCoex Status"); /*TODO: Return the btcoex status*/ } else if( strcasecmp(cmd, "rxfilter-start") == 0 ) { - hddLog(VOS_TRACE_LEVEL_INFO, "Rx Data Filter Start command\n"); + hddLog(VOS_TRACE_LEVEL_INFO, "Rx Data Filter Start command"); /*TODO: Enable Rx data Filter*/ } else if( strcasecmp(cmd, "rxfilter-stop") == 0 ) { - hddLog(VOS_TRACE_LEVEL_INFO, "Rx Data Filter Stop command\n"); + hddLog(VOS_TRACE_LEVEL_INFO, "Rx Data Filter Stop command"); /*TODO: Disable Rx data Filter*/ } else if( strcasecmp(cmd, "rxfilter-statistics") == 0 ) { - hddLog( VOS_TRACE_LEVEL_INFO, "Rx Data Filter Statistics command\n"); + hddLog( VOS_TRACE_LEVEL_INFO, "Rx Data Filter Statistics command"); /*TODO: rxfilter-statistics*/ } else if( strncasecmp(cmd, "rxfilter-add", 12) == 0 ) { - hddLog( VOS_TRACE_LEVEL_INFO, "rxfilter-add\n"); + hddLog( VOS_TRACE_LEVEL_INFO, "rxfilter-add"); /*TODO: rxfilter-add*/ } else if( strncasecmp(cmd, "rxfilter-remove",15) == 0 ) { - hddLog( VOS_TRACE_LEVEL_INFO, "rxfilter-remove\n"); + hddLog( VOS_TRACE_LEVEL_INFO, "rxfilter-remove"); /*TODO: rxfilter-remove*/ } #ifdef FEATURE_WLAN_SCAN_PNO @@ -3665,7 +3665,7 @@ static int iw_set_encode(struct net_device *dev,struct iw_request_info *info, if(wrqu->data.flags & IW_ENCODE_DISABLED) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "****iwconfig wlan0 key off*****\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "****iwconfig wlan0 key off*****"); if(!fKeyPresent) { for(i=0;i < CSR_MAX_NUM_KEY; i++) { @@ -3802,7 +3802,7 @@ static int iw_get_encodeext(struct net_device *dev, if(keyId < 0 || keyId >= MAX_WEP_KEYS) { - hddLog(LOG1,"%s: Invalid keyId : %d\n",__func__,keyId); + hddLog(LOG1,"%s: Invalid keyId : %d", __func__, keyId); return -EINVAL; } @@ -3911,7 +3911,7 @@ static int iw_set_encodeext(struct net_device *dev, { if(IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) { - VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,("Invalid Configuration:%s \n"),__func__); + VOS_TRACE (VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,("Invalid Configuration:%s"), __func__); return -EINVAL; } else { @@ -4014,7 +4014,7 @@ static int iw_set_encodeext(struct net_device *dev, } VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d \n"),__func__,(int)ext->alg,(int)ext->key_len,setKey.encType); + ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d"),__func__,(int)ext->alg,(int)ext->key_len,setKey.encType); #ifdef WLAN_FEATURE_VOWIFI_11R /* The supplicant may attempt to set the PTK once pre-authentication @@ -4079,7 +4079,7 @@ static int iw_set_retry(struct net_device *dev, struct iw_request_info *info, if(wrqu->retry.value < WNI_CFG_LONG_RETRY_LIMIT_STAMIN || wrqu->retry.value > WNI_CFG_LONG_RETRY_LIMIT_STAMAX) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Invalid Retry-Limit=%d!!\n"),wrqu->retry.value); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("Invalid Retry-Limit=%d!!"),wrqu->retry.value); return -EINVAL; } @@ -4110,7 +4110,7 @@ static int iw_set_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("Set Retry-Limit=%d!!\n"),wrqu->retry.value); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("Set Retry-Limit=%d!!"),wrqu->retry.value); EXIT(); @@ -4164,7 +4164,7 @@ static int iw_get_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!\n"),retry); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"),retry); EXIT(); @@ -4216,7 +4216,7 @@ static int iw_set_mlme(struct net_device *dev, FL("failed wait on disconnect_comp_var %ld"), ret); } else - hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d \n", + hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate : csrRoamDisconnect failure returned %d", __func__, (int)mlme->cmd, (int)status ); /* Resetting authKeyMgmt */ @@ -4228,11 +4228,11 @@ static int iw_set_mlme(struct net_device *dev, } else { - hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state \n", __func__, (int)mlme->cmd ); + hddLog(LOGE,"%s %d Command Disassociate/Deauthenticate called but station is not in associated state", __func__, (int)mlme->cmd ); } break; default: - hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate \n", __func__, (int)mlme->cmd ); + hddLog(LOGE,"%s %d Command should be Disassociate/Deauthenticate", __func__, (int)mlme->cmd ); return -EINVAL; }//end of switch @@ -4502,7 +4502,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf smeConfig.csrConfig.Is11dSupportEnabled = (v_BOOL_t)set_value; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - ("11D state=%d!!\n"), + ("11D state=%d!!"), smeConfig.csrConfig.Is11dSupportEnabled); sme_UpdateConfig(hHal, &smeConfig); @@ -4525,12 +4525,12 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf case 0x03: enable_mp = (set_value & 0x01) ? 1 : 0; enable_pbm = (set_value & 0x02) ? 1 : 0; - hddLog(LOGE, "magic packet ? = %s pattern byte matching ? = %s\n", + hddLog(LOGE, "magic packet ? = %s pattern byte matching ? = %s", (enable_mp ? "YES":"NO"), (enable_pbm ? "YES":"NO")); hdd_enter_wowl(pAdapter, enable_mp, enable_pbm); break; default: - hddLog(LOGE, "Invalid arg %d in WE_WOWL IOCTL\n", set_value); + hddLog(LOGE, "Invalid arg %d in WE_WOWL IOCTL", set_value); ret = -EINVAL; break; } @@ -4581,7 +4581,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf context.magic = 0; spin_unlock(&hdd_context_lock); - hddLog(LOGE, "iwpriv Full Power completed\n"); + hddLog(LOGE, "iwpriv Full Power completed"); break; } case 1: //Enable BMPS @@ -4629,7 +4629,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf context.magic = 0; spin_unlock(&hdd_context_lock); - hddLog(LOGE, "iwpriv Request BMPS completed\n"); + hddLog(LOGE, "iwpriv Request BMPS completed"); break; } case 4: //Enable IMPS @@ -4678,7 +4678,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf vos_chipReset(NULL, VOS_FALSE, NULL, NULL, VOS_CHIP_RESET_UNKNOWN_EXCEPTION); break; default: - hddLog(LOGE, "Invalid arg %d in WE_SET_POWER IOCTL\n", set_value); + hddLog(LOGE, "Invalid arg %d in WE_SET_POWER IOCTL", set_value); ret = -EINVAL; break; } @@ -4715,7 +4715,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf } else { - hddLog(LOGE, "Invalid arg %d in WE_SET_SAP_AUTO_CHANNEL_SELECTION IOCTL\n", set_value); + hddLog(LOGE, "Invalid arg %d in WE_SET_SAP_AUTO_CHANNEL_SELECTION IOCTL", set_value); ret = -EINVAL; } break; @@ -4732,7 +4732,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf { hddLog(LOGE,"Failure: Could not pass on " "WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT configuration info " - "to CCM\n"); + "to CCM"); ret = -EINVAL; } break; @@ -5624,7 +5624,7 @@ static int iw_setint_getnone(struct net_device *dev, struct iw_request_info *inf smeConfig.csrConfig.scanBandPreference = set_value; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "set band scan preference = %d\n", + "set band scan preference = %d", smeConfig.csrConfig.scanBandPreference); sme_UpdateConfig(hHal, &smeConfig); @@ -5914,11 +5914,11 @@ static int iw_setchar_getnone(struct net_device *dev, struct iw_request_info *in switch(sub_cmd) { case WE_WOWL_ADD_PTRN: - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "ADD_PTRN\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "ADD_PTRN"); hdd_add_wowl_ptrn(pAdapter, pBuffer); break; case WE_WOWL_DEL_PTRN: - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "DEL_PTRN\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "DEL_PTRN"); hdd_del_wowl_ptrn(pAdapter, pBuffer); break; #if defined WLAN_FEATURE_VOWIFI @@ -5929,7 +5929,7 @@ static int iw_setchar_getnone(struct net_device *dev, struct iw_request_info *in if (pConfig->fRrmEnable) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Neighbor Request\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "Neighbor Request"); neighborReq.no_ssid = (wrqu->data.length - 1) ? false : true ; if( !neighborReq.no_ssid ) { @@ -5944,7 +5944,7 @@ static int iw_setchar_getnone(struct net_device *dev, struct iw_request_info *in } else { - hddLog(LOGE, "%s: Ignoring neighbor request as RRM is not enabled\n", __func__); + hddLog(LOGE, "%s: Ignoring neighbor request as RRM is not enabled", __func__); ret = -EINVAL; } } @@ -6001,19 +6001,19 @@ static int iw_setnone_getint(struct net_device *dev, struct iw_request_info *inf *value = smeConfig.csrConfig.Is11dSupportEnabled; - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("11D state=%d!!\n"),*value); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("11D state=%d!!"),*value); break; } case WE_IBSS_STATUS: - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "****Return IBSS Status*****\n"); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "****Return IBSS Status*****"); break; case WE_PMC_STATE: { *value = pmcGetPmcState(hHal); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("PMC state=%d!!\n"),*value); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("PMC state=%d!!"),*value); break; } case WE_GET_WLAN_DBG: @@ -6062,7 +6062,7 @@ static int iw_setnone_getint(struct net_device *dev, struct iw_request_info *inf { *value = hdd_get_concurrency_mode ( ); - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("concurrency mode=%d \n"),*value); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, ("concurrency mode=%d"),*value); break; } @@ -6521,7 +6521,7 @@ static int iw_setnone_getint(struct net_device *dev, struct iw_request_info *inf *value = smeConfig.csrConfig.scanBandPreference; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "scanBandPreference = %d\n", *value); + "scanBandPreference = %d", *value); break; } #endif @@ -6928,7 +6928,7 @@ static int iw_get_char_setnone(struct net_device *dev, struct iw_request_info *i status = iw_softap_get_channel_list(dev, info, wrqu, (char *)&channel_list); if ( !VOS_IS_STATUS_SUCCESS( status ) ) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s GetChannelList Failed!!!\n",__func__); + hddLog(VOS_TRACE_LEVEL_ERROR, "%s GetChannelList Failed!!!", __func__); return -EINVAL; } buf = extra; @@ -6940,7 +6940,7 @@ static int iw_get_char_setnone(struct net_device *dev, struct iw_request_info *i if(WE_MAX_STR_LEN < (5 * WNI_CFG_VALID_CHANNEL_LIST_LEN)) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s Insufficient Buffer to populate channel list\n", + "%s Insufficient Buffer to populate channel list", __func__); return -EINVAL; } @@ -7443,7 +7443,7 @@ int iw_set_var_ints_getnone(struct net_device *dev, struct iw_request_info *info } else { - hddLog(LOGE, "%s : Enter valid MccCredential value between MIN :40 and MAX:160\n", __func__); + hddLog(LOGE, "%s : Enter valid MccCredential value between MIN :40 and MAX:160", __func__); return 0; } } @@ -7799,7 +7799,7 @@ static int iw_qcom_set_wapi_assoc_info(struct net_device *dev, struct iw_request VOS_ASSERT(0); return VOS_STATUS_E_FAILURE; } - hddLog(LOG1, "%s: INPUT DATA:\nElement ID:0x%02x Length:0x%02x Version:0x%04x\n",__func__,pWapiAssocInfo->elementID,pWapiAssocInfo->length,pWapiAssocInfo->version); + hddLog(LOG1, "%s: INPUT DATA:\nElement ID:0x%02x Length:0x%02x Version:0x%04x",__func__,pWapiAssocInfo->elementID,pWapiAssocInfo->length,pWapiAssocInfo->version); hddLog(LOG1,"%s: akm Suite Cnt:0x%04x",__func__,pWapiAssocInfo->akmSuiteCount); for(i =0 ; i < 16 ; i++) hddLog(LOG1,"akm suite[%02d]:0x%08x",i,pWapiAssocInfo->akmSuite[i]); @@ -7809,7 +7809,7 @@ static int iw_qcom_set_wapi_assoc_info(struct net_device *dev, struct iw_request hddLog(LOG1, "Unicast suite[%02d]:0x%08x",i,pWapiAssocInfo->unicastSuite[i]); hddLog(LOG1,"%s: Multicast suite:0x%08x Wapi capa:0x%04x",__func__,pWapiAssocInfo->multicastSuite,pWapiAssocInfo->wapiCability); - hddLog(LOG1, "%s: BKID Cnt:0x%04x\n",__func__,pWapiAssocInfo->bkidCount); + hddLog(LOG1, "%s: BKID Cnt:0x%04x",__func__,pWapiAssocInfo->bkidCount); for(i = 0 ; i < 16 ; i++) { hddLog(LOG1, "BKID List[%02d].bkid:0x",i); for(j = 0 ; j < 16 ; j++) @@ -7856,22 +7856,22 @@ static int iw_qcom_set_wapi_key(struct net_device *dev, struct iw_request_info * hddLog(LOG1, "%s: Received length %d", __func__, wrqu->data.length); hddLog(LOG1, "%s: Received data %s", __func__, (char*)extra); - hddLog(LOG1,":%s: INPUT DATA:\nKey Type:0x%02x Key Direction:0x%02x KEY ID:0x%02x\n", __func__, pWapiKey->keyType, pWapiKey->keyDirection, pWapiKey->keyId); + hddLog(LOG1,":%s: INPUT DATA:\nKey Type:0x%02x Key Direction:0x%02x KEY ID:0x%02x", __func__, pWapiKey->keyType, pWapiKey->keyDirection, pWapiKey->keyId); hddLog(LOG1,"Add Index:0x"); for(i =0 ; i < 12 ; i++) hddLog(LOG1,"%02x",pWapiKey->addrIndex[i]); - hddLog(LOG1,"\n%s: WAPI ENCRYPTION KEY LENGTH:0x%04x", __func__,pWapiKey->wpiekLen); + hddLog(LOG1,"%s: WAPI ENCRYPTION KEY LENGTH:0x%04x", __func__,pWapiKey->wpiekLen); hddLog(LOG1, "WAPI ENCRYPTION KEY:0x"); for(i =0 ; i < 16 ; i++) hddLog(LOG1,"%02x",pWapiKey->wpiek[i]); - hddLog(LOG1,"\n%s: WAPI INTEGRITY CHECK KEY LENGTH:0x%04x", __func__,pWapiKey->wpickLen); + hddLog(LOG1,"%s: WAPI INTEGRITY CHECK KEY LENGTH:0x%04x", __func__,pWapiKey->wpickLen); hddLog(LOG1,"WAPI INTEGRITY CHECK KEY:0x"); for(i =0 ; i < 16 ; i++) hddLog(LOG1,"%02x",pWapiKey->wpick[i]); - hddLog(LOG1,"\nWAPI PN NUMBER:0x"); + hddLog(LOG1,"WAPI PN NUMBER:0x"); for(i = 0 ; i < 16 ; i++) hddLog(LOG1,"%02x",pWapiKey->pn[i]); @@ -8013,25 +8013,25 @@ static int iw_set_fties(struct net_device *dev, struct iw_request_info *info, } if (!wrqu->data.length) { - hddLog(LOGE, FL("called with 0 length IEs\n")); + hddLog(LOGE, FL("called with 0 length IEs")); return -EINVAL; } if (wrqu->data.pointer == NULL) { - hddLog(LOGE, FL("called with NULL IE\n")); + hddLog(LOGE, FL("called with NULL IE")); return -EINVAL; } // Added for debug on reception of Re-assoc Req. if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - hddLog(LOGE, FL("Called with Ie of length = %d when not associated\n"), + hddLog(LOGE, FL("Called with Ie of length = %d when not associated"), wrqu->data.length); - hddLog(LOGE, FL("Should be Re-assoc Req IEs\n")); + hddLog(LOGE, FL("Should be Re-assoc Req IEs")); } #ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG - hddLog(LOG1, FL("%s called with Ie of length = %d\n"), __func__, wrqu->data.length); + hddLog(LOG1, FL("%s called with Ie of length = %d"), __func__, wrqu->data.length); #endif // Pass the received FT IEs to SME @@ -8244,7 +8244,7 @@ static int iw_set_host_offload(struct net_device *dev, struct iw_request_info *i break; case WLAN_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD: - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Host offload request: neighbor discovery\n", + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Host offload request: neighbor discovery", __func__); switch (pRequest->enableOrDisable) { @@ -8273,7 +8273,7 @@ static int iw_set_host_offload(struct net_device *dev, struct iw_request_info *i if (eHAL_STATUS_SUCCESS != sme_SetHostOffload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offloadRequest)) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute host offload request\n", + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute host offload request", __func__); return -EINVAL; } @@ -8307,7 +8307,7 @@ static int iw_set_keepalive_params(struct net_device *dev, struct iw_request_inf break; case WLAN_KEEP_ALIVE_UNSOLICIT_ARP_RSP: - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Keep Alive Request: Tx UnSolicited ARP RSP\n", + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Keep Alive Request: Tx UnSolicited ARP RSP", __func__); hddLog(VOS_TRACE_LEVEL_WARN, " Host IP address: %d.%d.%d.%d", @@ -8331,12 +8331,12 @@ static int iw_set_keepalive_params(struct net_device *dev, struct iw_request_inf copied individually. */ memcpy(&keepaliveRequest, pRequest, wrqu->data.length); - hddLog(VOS_TRACE_LEVEL_ERROR, "set Keep: TP before SME %d\n", keepaliveRequest.timePeriod); + hddLog(VOS_TRACE_LEVEL_ERROR, "set Keep: TP before SME %d", keepaliveRequest.timePeriod); if (eHAL_STATUS_SUCCESS != sme_SetKeepAlive(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &keepaliveRequest)) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Keep Alive\n", + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Keep Alive", __func__); return -EINVAL; } @@ -8377,7 +8377,7 @@ int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, packetFilterSetReq.filterId = pRequest->filterId; if ( pRequest->numParams >= HDD_MAX_CMP_PER_PACKET_FILTER) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Number of Params exceed Max limit %d\n", + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Number of Params exceed Max limit %d", __func__, pRequest->numParams); return -EINVAL; } @@ -8392,11 +8392,11 @@ int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, packetFilterSetReq.paramsData[i].dataLength = pRequest->paramsData[i].dataLength; packetFilterSetReq.paramsData[i].reserved = 0; - hddLog(VOS_TRACE_LEVEL_INFO, "Proto %d Comp Flag %d Filter Type %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "Proto %d Comp Flag %d Filter Type %d", pRequest->paramsData[i].protocolLayer, pRequest->paramsData[i].cmpFlag, packetFilterSetReq.filterType); - hddLog(VOS_TRACE_LEVEL_INFO, "Data Offset %d Data Len %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "Data Offset %d Data Len %d", pRequest->paramsData[i].dataOffset, pRequest->paramsData[i].dataLength); memcpy(&packetFilterSetReq.paramsData[i].compareData, @@ -8404,12 +8404,12 @@ int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, memcpy(&packetFilterSetReq.paramsData[i].dataMask, pRequest->paramsData[i].dataMask, pRequest->paramsData[i].dataLength); - hddLog(VOS_TRACE_LEVEL_INFO, "CData %d CData %d CData %d CData %d CData %d CData %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "CData %d CData %d CData %d CData %d CData %d CData %d", pRequest->paramsData[i].compareData[0], pRequest->paramsData[i].compareData[1], pRequest->paramsData[i].compareData[2], pRequest->paramsData[i].compareData[3], pRequest->paramsData[i].compareData[4], pRequest->paramsData[i].compareData[5]); - hddLog(VOS_TRACE_LEVEL_INFO, "MData %d MData %d MData %d MData %d MData %d MData %d\n", + hddLog(VOS_TRACE_LEVEL_INFO, "MData %d MData %d MData %d MData %d MData %d MData %d", pRequest->paramsData[i].dataMask[0], pRequest->paramsData[i].dataMask[1], pRequest->paramsData[i].dataMask[2], pRequest->paramsData[i].dataMask[3], pRequest->paramsData[i].dataMask[4], pRequest->paramsData[i].dataMask[5]); @@ -8417,7 +8417,7 @@ int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, if (eHAL_STATUS_SUCCESS != sme_ReceiveFilterSetFilter(pHddCtx->hHal, &packetFilterSetReq, sessionId)) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Set Filter\n", + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Set Filter", __func__); return -EINVAL; } @@ -8426,19 +8426,19 @@ int wlan_hdd_set_filter(hdd_context_t *pHddCtx, tpPacketFilterCfg pRequest, case HDD_RCV_FILTER_CLEAR: - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Clear Packet Filter Request for Id: %d\n", + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Clear Packet Filter Request for Id: %d", __func__, pRequest->filterId); packetFilterClrReq.filterId = pRequest->filterId; if (eHAL_STATUS_SUCCESS != sme_ReceiveFilterClearFilter(pHddCtx->hHal, &packetFilterClrReq, sessionId)) { - hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Clear Filter\n", + hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Failure to execute Clear Filter", __func__); return -EINVAL; } break; default : - hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Packet Filter Request: Invalid %d\n", + hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: Packet Filter Request: Invalid %d", __func__, pRequest->filterAction); return -EINVAL; } @@ -9371,7 +9371,7 @@ int hdd_setBand(struct net_device *dev, u8 ui_band) if ( eHAL_STATUS_SUCCESS != status) { hddLog(VOS_TRACE_LEVEL_ERROR, - "%s csrRoamDisconnect failure, returned %d \n", + "%s csrRoamDisconnect failure, returned %d", __func__, (int)status ); return -EINVAL; } @@ -10875,7 +10875,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10891,7 +10891,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10907,7 +10907,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10923,7 +10923,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10939,7 +10939,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10955,7 +10955,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10971,7 +10971,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -10987,7 +10987,7 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } @@ -11003,14 +11003,14 @@ int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t ar } else { - hddLog(LOGE, "%s : Enter a valid MCC configuration value\n",__FUNCTION__); + hddLog(LOGE, "%s : Enter a valid MCC configuration value", __FUNCTION__); return 0; } } break; default : - hddLog(LOGE, "%s : Uknown / Not allowed to configure parameter : %d\n", + hddLog(LOGE, "%s : Uknown / Not allowed to configure parameter : %d", __FUNCTION__,arg1); break; } @@ -11078,19 +11078,19 @@ int hdd_register_wext(struct net_device *dev) if(!VOS_IS_STATUS_SUCCESS(status)) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!\n")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); return eHAL_STATUS_FAILURE; } if (!VOS_IS_STATUS_SUCCESS(vos_event_init(&pwextBuf->vosevent))) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: HDD vos event init failed!!\n")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: HDD vos event init failed!!")); return eHAL_STATUS_FAILURE; } if (!VOS_IS_STATUS_SUCCESS(vos_event_init(&pwextBuf->scanevent))) { - VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!\n")); + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); return eHAL_STATUS_FAILURE; } diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c index ab3d4a4a98ec..085de8ce1cf3 100644 --- a/CORE/HDD/src/wlan_hdd_wmm.c +++ b/CORE/HDD/src/wlan_hdd_wmm.c @@ -471,7 +471,7 @@ void hdd_wmm_inactivity_timer_cb( v_PVOID_t pUserData ) currentTrafficCnt = pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext->acType]; VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_WARN, - FL("WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d\n"), + FL("WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d"), acType, (int)currentTrafficCnt, (int)pAc->wmmPrevTrafficCnt); if (pAc->wmmPrevTrafficCnt == currentTrafficCnt) { @@ -688,7 +688,7 @@ static eHalStatus hdd_wmm_sme_callback (tHalHandle hHal, // Check if the inactivity interval is specified if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) { VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, - "%s: Inactivity timer value = %d for AC=%d\n", + "%s: Inactivity timer value = %d for AC=%d", __func__, pCurrentQosInfo->inactivity_interval, acType); hdd_wmm_enable_inactivity_timer(pQosContext, pCurrentQosInfo->inactivity_interval); } @@ -835,7 +835,7 @@ static eHalStatus hdd_wmm_sme_callback (tHalHandle hHal, case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP: VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, - "%s: Setup failed, not a QoS AP\n", + "%s: Setup failed, not a QoS AP", __func__); if (!HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle) { @@ -1213,7 +1213,7 @@ static eHalStatus hdd_wmm_sme_callback (tHalHandle hHal, default: VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, - "%s: unexpected SME Status=%d\n", + "%s: unexpected SME Status=%d", __func__, smeStatus ); VOS_ASSERT(0); } @@ -1508,7 +1508,7 @@ static void hdd_wmm_do_implicit_qos(struct work_struct *work) default: VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, - "%s: unexpected SME Status=%d\n", + "%s: unexpected SME Status=%d", __func__, smeStatus ); VOS_ASSERT(0); } @@ -2500,7 +2500,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts( hdd_adapter_t* pAdapter, default: // we didn't get back one of the SME_QOS_STATUS_MODIFY_* status codes VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, - "%s: unexpected SME Status=%d\n", __func__, smeStatus ); + "%s: unexpected SME Status=%d", __func__, smeStatus ); VOS_ASSERT(0); return HDD_WLAN_WMM_STATUS_MODIFY_FAILED; } @@ -2586,7 +2586,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts( hdd_adapter_t* pAdapter, // we didn't get back one of the SME_QOS_STATUS_SETUP_* status codes hdd_wmm_free_context(pQosContext); VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, - "%s: unexpected SME Status=%d\n", __func__, smeStatus ); + "%s: unexpected SME Status=%d", __func__, smeStatus ); VOS_ASSERT(0); return HDD_WLAN_WMM_STATUS_SETUP_FAILED; } @@ -2697,7 +2697,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts( hdd_adapter_t* pAdapter, default: // we didn't get back one of the SME_QOS_STATUS_RELEASE_* status codes VOS_TRACE( VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, - "%s: unexpected SME Status=%d\n", __func__, smeStatus ); + "%s: unexpected SME Status=%d", __func__, smeStatus ); VOS_ASSERT(0); status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED; } diff --git a/CORE/HDD/src/wlan_hdd_wowl.c b/CORE/HDD/src/wlan_hdd_wowl.c index 3a7e92a4fe56..0ad7d98c23e5 100644 --- a/CORE/HDD/src/wlan_hdd_wowl.c +++ b/CORE/HDD/src/wlan_hdd_wowl.c @@ -77,7 +77,7 @@ static inline int find_ptrn_len(const char* ptrn) static void hdd_wowl_callback( void *pContext, eHalStatus halStatus ) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, - "%s: Return code = (%d)\n", __func__, halStatus ); + "%s: Return code = (%d)", __func__, halStatus ); } #ifdef WLAN_WAKEUP_EVENTS @@ -175,7 +175,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: Malformed pattern string. Skip!\n", __func__); + "%s: Malformed pattern string. Skip!", __func__); ptrn += len; goto next_ptrn; } @@ -192,7 +192,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) localPattern.ucPatternMaskSize > WOWL_PTRN_MASK_MAX_SIZE) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: Invalid length specified. Skip!\n", __func__); + "%s: Invalid length specified. Skip!", __func__); ptrn += len; goto next_ptrn; } @@ -202,7 +202,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) if(offset >= len || ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER) { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: Malformed pattern string..skip!\n", __func__); + "%s: Malformed pattern string..skip!", __func__); ptrn += len; goto next_ptrn; } @@ -212,7 +212,7 @@ v_BOOL_t hdd_add_wowl_ptrn (hdd_adapter_t *pAdapter, const char * ptrn) if(offset+1 != len) //offset begins with 0 { VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR, - "%s: Malformed pattern string...skip!\n", __func__); + "%s: Malformed pattern string...skip!", __func__); ptrn += len; goto next_ptrn; } |
