wlan: Issue with debug prints in multiple modules.
In many files there were missing variables and debug prints and
also wrong format specifiers which was leading to compiler
warnings and errors. Hence fixed all those errors and warnings.
CRs-fixed: 467528
Change-Id: Iabaabcd62654a3fef691d080f4aac2dc0e084afd
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index a446664..8dbcdd4 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1811,7 +1811,7 @@
pConfig->mcRSNEncryptType = mcRSNEncryptType;
(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->ucEncryptType
= RSNEncryptType;
- hddLog( LOG1, FL("%s: CSR AuthType = %d, "
+ hddLog( LOG1, FL("CSR AuthType = %d, "
"EncryptionType = %d mcEncryptionType = %d\n"),
RSNAuthType, RSNEncryptType, mcRSNEncryptType);
}
@@ -1850,7 +1850,7 @@
pConfig->mcRSNEncryptType = mcRSNEncryptType;
(WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->ucEncryptType
= RSNEncryptType;
- hddLog( LOG1, FL("%s: CSR AuthType = %d, "
+ hddLog( LOG1, FL("CSR AuthType = %d, "
"EncryptionType = %d mcEncryptionType = %d\n"),
RSNAuthType, RSNEncryptType, mcRSNEncryptType);
}
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index e567805..a965eb1 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -1009,7 +1009,7 @@
if (NULL == pVosContext)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Trying to open VOSS without a PreOpen",__func__);
+ "%s: Trying to open VOSS without a PreOpen", __func__);
VOS_ASSERT(0);
goto err_vos_status_failure;
}
@@ -1019,7 +1019,7 @@
if ( !VOS_IS_STATUS_SUCCESS( vStatus ))
{
- hddLog(VOS_TRACE_LEVEL_FATAL,"%s: vos_open failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_FATAL,"%s: vos_open failed", __func__);
goto err_vos_status_failure;
}
@@ -1031,7 +1031,7 @@
if ( NULL == pHddCtx->hHal )
{
- hddLog(VOS_TRACE_LEVEL_ERROR,"%s: HAL context is null",__func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: HAL context is null", __func__);
goto err_sal_close;
}
@@ -1039,20 +1039,20 @@
wlan_hdd_get_intf_addr(pHddCtx), FALSE);
if( NULL == pAdapter )
{
- hddLog(VOS_TRACE_LEVEL_ERROR,"%s: hdd_open_adapter failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: hdd_open_adapter failed", __func__);
goto err_adapter_open_failure;
}
if( wlan_ftm_register_wext(pAdapter)!= 0 )
{
- hddLog(VOS_TRACE_LEVEL_ERROR,"%S: hdd_register_wext failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: hdd_register_wext failed", __func__);
goto err_sal_close;
}
//Initialize the nlink service
if(nl_srv_init() != 0)
{
- hddLog(VOS_TRACE_LEVEL_ERROR,"%S: nl_srv_init failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: nl_srv_init failed", __func__);
goto err_ftm_register_wext_close;
}
@@ -1060,7 +1060,7 @@
//Initialize the PTT service
if(ptt_sock_activate_svc(pHddCtx) != 0)
{
- hddLog(VOS_TRACE_LEVEL_ERROR,"%s: ptt_sock_activate_svc failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: ptt_sock_activate_svc failed", __func__);
goto err_nl_srv_init;
}
#endif
@@ -1085,7 +1085,7 @@
if(NULL == pHddCtx->ftm.tempNVTableBuffer)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: NV Table Buffer Alloc Fail",__func__);
+ "%s: NV Table Buffer Alloc Fail", __func__);
VOS_ASSERT(0);
goto err_nl_srv_init;
}
@@ -1096,7 +1096,7 @@
if (vos_event_init(&pHddCtx->ftm.ftm_vos_event) != VOS_STATUS_SUCCESS)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: Unable to init probeEvent",__func__);
+ "%s: Unable to init probeEvent", __func__);
VOS_ASSERT(0);
vos_mem_free(pHddCtx->ftm.tempNVTableBuffer);
goto err_nl_srv_init;
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index e4e9ce7..9d79a71 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1442,7 +1442,7 @@
//TODO: Need to handle mixed mode
pConfig->RSNEncryptType = RSNEncryptType; // Use the cipher type in the RSN IE
pConfig->mcRSNEncryptType = mcRSNEncryptType;
- hddLog( LOG1, FL("%s: CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d\n"),
+ hddLog( LOG1, FL("CSR AuthType = %d, EncryptionType = %d mcEncryptionType = %d\n"),
RSNAuthType, RSNEncryptType, mcRSNEncryptType);
}
}
@@ -1952,7 +1952,7 @@
}
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- ("%s:EncryptionType:%d key_len:%d, :%d, KeyId:%d \n"),__func__, setKey.encType, setKey.keyLength,
+ ("%s:EncryptionType:%d key_len:%d, KeyId:%d"), __func__, setKey.encType, setKey.keyLength,
setKey.keyId);
for(i=0; i< ext->key_len; i++)
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 14d2ff9..8801b7b 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1993,7 +1993,7 @@
if (test_bit(DEVICE_IFACE_OPENED, &pAdapterNode->pAdapter->event_flags))
{
hddLog(VOS_TRACE_LEVEL_INFO, "%s: chip already out of standby",
- __func__, pAdapter->device_mode);
+ __func__);
in_standby = FALSE;
break;
}
@@ -2103,7 +2103,7 @@
if (test_bit(DEVICE_IFACE_OPENED, &pAdapterNode->pAdapter->event_flags))
{
hddLog(VOS_TRACE_LEVEL_INFO, "%s: Still other ifaces are up cannot "
- "put device to sleep", __func__, pAdapter->device_mode);
+ "put device to sleep", __func__);
enter_standby = FALSE;
break;
}
@@ -4187,7 +4187,7 @@
struct fullPowerContext *pContext = callbackContext;
hddLog(VOS_TRACE_LEVEL_INFO,
- "%s: context = %p, status = %d", pContext, status);
+ "%s: context = %p, status = %d", __func__, pContext, status);
if (NULL == callbackContext)
{
@@ -4561,7 +4561,7 @@
halStatus = sme_HDDReadyInd( pHddCtx->hHal );
if ( !HAL_STATUS_SUCCESS( halStatus ) )
{
- hddLog(VOS_TRACE_LEVEL_ERROR,"%S: sme_HDDReadyInd() failed with status "
+ hddLog(VOS_TRACE_LEVEL_ERROR,"%s: sme_HDDReadyInd() failed with status "
"code %08d [x%08x]",__func__, halStatus, halStatus );
return VOS_STATUS_E_FAILURE;
}
@@ -5184,7 +5184,7 @@
//Initialize the nlink service
if(nl_srv_init() != 0)
{
- hddLog(VOS_TRACE_LEVEL_FATAL,"%S: nl_srv_init failed",__func__);
+ hddLog(VOS_TRACE_LEVEL_FATAL,"%s: nl_srv_init failed", __func__);
goto err_reg_netdev;
}
@@ -5694,7 +5694,7 @@
ENTER();
- hddLog( LOGE, "hdd_softap_sta_deauth:(0x%x, false)", (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
+ hddLog( LOGE, "hdd_softap_sta_deauth:(%p, false)", (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
//Ignore request to deauth bcmc station
if( pDestMacAddress[0] & 0x1 )
@@ -5726,7 +5726,7 @@
ENTER();
- hddLog( LOGE, "hdd_softap_sta_disassoc:(0x%x, false)", (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
+ hddLog( LOGE, "hdd_softap_sta_disassoc:(%p, false)", (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
//Ignore request to disassoc bcmc station
if( pDestMacAddress[0] & 0x1 )
@@ -5741,7 +5741,7 @@
ENTER();
- hddLog( LOGE, "hdd_softap_tkip_mic_fail_counter_measure:(0x%x, false)", (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
+ hddLog( LOGE, "hdd_softap_tkip_mic_fail_counter_measure:(%p, false)", (WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
WLANSAP_SetCounterMeasure(pVosContext, (v_BOOL_t)enable);
}
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index 98b5a00..44ff307 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -217,7 +217,7 @@
}
else if (FALSE == pAdapter->aStaInfo[STAId].isUsed )
{
- VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s: STA is unregistered", __func__, STAId);
+ VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,"%s: STA %d is unregistered", __func__, STAId);
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
kfree_skb(skb);
@@ -372,7 +372,7 @@
if ( FALSE == pAdapter->aStaInfo[STAId].isUsed )
{
VOS_TRACE( VOS_MODULE_ID_HDD_SOFTAP, VOS_TRACE_LEVEL_WARN,
- "%s: STA is unregistered", __func__, STAId );
+ "%s: STA %d is unregistered", __func__, STAId );
kfree_skb(skb);
status = VOS_STATUS_E_FAILURE;
goto xmit_end;
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index ba1054b..6a49ea8 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -4532,7 +4532,7 @@
}
else
{
- hddLog(LOGE, "%s : Enter valid MccCredential value between MIN :40 and MAX:160\n");
+ hddLog(LOGE, "%s : Enter valid MccCredential value between MIN :40 and MAX:160\n", __func__);
return 0;
}
}
@@ -4927,7 +4927,7 @@
hddLog(LOG1, "%s: Received data %s", __func__, (char*)wrqu->data.pointer);
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\n", __func__, pWapiKey->keyType, pWapiKey->keyDirection, pWapiKey->keyId);
hddLog(LOG1,"Add Index:0x");
for(i =0 ; i < 12 ; i++)
hddLog(LOG1,"%02x",pWapiKey->addrIndex[i]);
@@ -5085,12 +5085,12 @@
}
if (!wrqu->data.length)
{
- hddLog(LOGE, FL("%s called with 0 length IEs\n"));
+ hddLog(LOGE, FL("called with 0 length IEs\n"));
return -EINVAL;
}
if (wrqu->data.pointer == NULL)
{
- hddLog(LOGE, FL("%s called with NULL IE\n"));
+ hddLog(LOGE, FL("called with NULL IE\n"));
return -EINVAL;
}
@@ -5448,7 +5448,7 @@
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\n",
+ hddLog(VOS_TRACE_LEVEL_INFO, "Proto %d Comp Flag %d Filter Type %d\n",
pRequest->paramsData[i].protocolLayer, pRequest->paramsData[i].cmpFlag,
packetFilterSetReq.filterType);
@@ -5774,7 +5774,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"PNO data len %d data %s",
wrqu->data.length,
- wrqu->data.pointer);
+ (char *)wrqu->data.pointer);
if (wrqu->data.length <= nOffset )
{
@@ -6231,7 +6231,7 @@
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"Power Params data len %d data %s",
wrqu->data.length,
- wrqu->data.pointer);
+ (char *)wrqu->data.pointer);
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index 6dae2a3..5992c6e 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.c
@@ -2268,7 +2268,7 @@
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", smeStatus );
+ "%s: unexpected SME Status=%d\n", __func__, smeStatus );
VOS_ASSERT(0);
return HDD_WLAN_WMM_STATUS_MODIFY_FAILED;
}
@@ -2346,7 +2346,7 @@
// 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", smeStatus );
+ "%s: unexpected SME Status=%d\n", __func__, smeStatus );
VOS_ASSERT(0);
return HDD_WLAN_WMM_STATUS_SETUP_FAILED;
}
@@ -2457,7 +2457,7 @@
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", smeStatus );
+ "%s: unexpected SME Status=%d\n", __func__, smeStatus );
VOS_ASSERT(0);
status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED;
}