qcacld-3.0: Add QDF types
Replace CDF types with QDF types
Change-Id: Idd6e65b148efb54f22d6951572957f1c6166465b
CRs-Fixed: 981188
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 211d092..07d4cb7 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -516,8 +516,8 @@
ftEvent.target_ap = ftIe;
- ftEvent.ies = (u8 *) (ftIe + CDF_MAC_ADDR_SIZE);
- ftEvent.ies_len = auth_resp_len - CDF_MAC_ADDR_SIZE;
+ ftEvent.ies = (u8 *) (ftIe + QDF_MAC_ADDR_SIZE);
+ ftEvent.ies_len = auth_resp_len - QDF_MAC_ADDR_SIZE;
hddLog(LOG1, FL("ftEvent.ies_len %zu"), ftEvent.ies_len);
hddLog(LOG1, FL("ftEvent.ric_ies_len %zu"), ftEvent.ric_ies_len);
@@ -664,7 +664,7 @@
*/
cdf_mem_zero(&buff[strLen + 1], IW_CUSTOM_MAX - (strLen + 1));
currentLen =
- CDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1);
+ QDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1);
cdf_mem_copy(&buff[strLen + 1], pBeaconIes + currentOffset,
currentLen);
currentOffset += currentLen;
@@ -699,7 +699,7 @@
union iwreq_data wrqu;
int we_event;
char *msg;
- struct cdf_mac_addr peerMacAddr;
+ struct qdf_mac_addr peerMacAddr;
/* Added to find the auth type on the fly at run time */
/* rather than with cfg to see if FT is enabled */
@@ -893,9 +893,9 @@
{
/* Remove staId, bssId and peerMacAddress */
pHddStaCtx->conn_info.staId[0] = 0;
- cdf_mem_zero(&pHddStaCtx->conn_info.bssId, CDF_MAC_ADDR_SIZE);
+ cdf_mem_zero(&pHddStaCtx->conn_info.bssId, QDF_MAC_ADDR_SIZE);
cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[0],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
/* Clear all security settings */
pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
@@ -1107,7 +1107,7 @@
*/
pHddStaCtx->conn_info.staId[i] = 0;
cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[i],
- sizeof(struct cdf_mac_addr));
+ sizeof(struct qdf_mac_addr));
if (sta_id < (WLAN_MAX_STA_COUNT + 3))
pHddCtx->sta_to_adapter[sta_id] = NULL;
}
@@ -1162,7 +1162,7 @@
*/
void hdd_set_peer_authorized_event(uint32_t vdev_id)
{
- hdd_context_t *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
hdd_adapter_t *adapter = NULL;
adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
@@ -1188,7 +1188,7 @@
{
struct ol_txrx_peer_t *peer;
QDF_STATUS err;
- struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+ struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
if (!pdev) {
hdd_err("Failed to get txrx context");
@@ -1263,7 +1263,7 @@
static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter,
tCsrRoamInfo *pRoamInfo,
uint8_t staId,
- struct cdf_mac_addr *pPeerMacAddress,
+ struct qdf_mac_addr *pPeerMacAddress,
tSirBssDescription *pBssDesc)
{
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
@@ -1437,7 +1437,7 @@
roam_profile.SSID.length);
ssid_ie_len = 2 + roam_profile.SSID.length;
hdd_notice("SSIDIE:");
- CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+ CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
buf_ssid_ie, ssid_ie_len);
final_req_ie = kmalloc(IW_GENERIC_IE_MAX, GFP_KERNEL);
if (final_req_ie == NULL)
@@ -1450,7 +1450,7 @@
cdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength),
IW_GENERIC_IE_MAX - (ssid_ie_len + reqRsnLength));
hdd_notice("Req RSN IE:");
- CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+ CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
final_req_ie, (ssid_ie_len + reqRsnLength));
cfg80211_roamed_bss(dev, bss,
final_req_ie, (ssid_ie_len + reqRsnLength),
@@ -1461,7 +1461,7 @@
pCsrRoamInfo->nAssocReqLength);
hdd_notice("ReAssoc Req IE dump");
- CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+ CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
assoc_req_ies, pCsrRoamInfo->nAssocReqLength);
wlan_hdd_send_roam_auth_event(pHddCtx, pCsrRoamInfo->bssid.bytes,
@@ -1666,9 +1666,9 @@
tCsrRoamInfo roamInfo;
roamInfo.fAuthRequired = false;
cdf_mem_copy(roamInfo.bssid.bytes,
- pHddStaCtx->roam_info.bssid, CDF_MAC_ADDR_SIZE);
+ pHddStaCtx->roam_info.bssid, QDF_MAC_ADDR_SIZE);
cdf_mem_copy(roamInfo.peerMac.bytes,
- pHddStaCtx->roam_info.peerMac, CDF_MAC_ADDR_SIZE);
+ pHddStaCtx->roam_info.peerMac, QDF_MAC_ADDR_SIZE);
cdf_ret_status =
hdd_roam_set_key_complete_handler(pAdapter,
@@ -1950,7 +1950,7 @@
hdd_notice(
"Reassoc Req IE dump");
CDF_TRACE_HEX_DUMP(
- CDF_MODULE_ID_HDD,
+ QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_DEBUG,
pFTAssocReq,
assocReqlen);
@@ -1986,11 +1986,11 @@
cdf_mem_copy(pHddStaCtx->
roam_info.bssid,
pRoamInfo->bssid.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
cdf_mem_copy(pHddStaCtx->
roam_info.peerMac,
pRoamInfo->peerMac.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
pHddStaCtx->roam_info.roamId =
roamId;
pHddStaCtx->roam_info.
@@ -2340,8 +2340,8 @@
(hdd_context_t *) pAdapter->pHddCtx;
hdd_station_ctx_t *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- struct cdf_mac_addr broadcastMacAddr =
- CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr broadcastMacAddr =
+ QDF_MAC_ADDR_BROADCAST_INITIALIZER;
if (NULL == pRoamInfo) {
CDF_ASSERT(0);
@@ -2464,7 +2464,7 @@
* false otherwise.
*/
static bool roam_save_ibss_station(hdd_station_ctx_t *pHddStaCtx, uint8_t staId,
- struct cdf_mac_addr *peerMacAddress)
+ struct qdf_mac_addr *peerMacAddress)
{
bool fSuccess = false;
int idx = 0;
@@ -3077,7 +3077,7 @@
cdf_mem_zero(&pHddCtx->
tdlsConnInfo[staIdx].
peerMac,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
status = QDF_STATUS_SUCCESS;
break;
}
@@ -3138,7 +3138,7 @@
&pHddCtx->
tdlsConnInfo[staIdx].
peerMac.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
smeTdlsPeerStateParams.peerState =
eSME_TDLS_PEER_STATE_TEARDOWN;
@@ -3171,7 +3171,7 @@
cdf_mem_zero(&pHddCtx->
tdlsConnInfo[staIdx].
peerMac,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
pHddCtx->tdlsConnInfo[staIdx].staId = 0;
pHddCtx->tdlsConnInfo[staIdx].
sessionId = 255;
@@ -3184,12 +3184,12 @@
case eCSR_ROAM_RESULT_TDLS_SHOULD_DISCOVER:
{
/* ignore TDLS_SHOULD_DISCOVER if any concurrency detected */
- if (((1 << CDF_STA_MODE) != pHddCtx->concurrency_mode) ||
- (pHddCtx->no_of_active_sessions[CDF_STA_MODE] > 1)) {
+ if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) ||
+ (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) {
hddLog(LOG2,
FL("concurrency detected. ignore SHOULD_DISCOVER concurrency_mode: 0x%x, active_sessions: %d"),
pHddCtx->concurrency_mode,
- pHddCtx->no_of_active_sessions[CDF_STA_MODE]);
+ pHddCtx->no_of_active_sessions[QDF_STA_MODE]);
status = QDF_STATUS_E_FAILURE;
break;
}
@@ -3498,9 +3498,9 @@
pos += nBytes;
freeBytes -= nBytes;
- cdf_mem_copy(pos, pRoamInfo->bssid.bytes, CDF_MAC_ADDR_SIZE);
- pos += CDF_MAC_ADDR_SIZE;
- freeBytes -= CDF_MAC_ADDR_SIZE;
+ cdf_mem_copy(pos, pRoamInfo->bssid.bytes, QDF_MAC_ADDR_SIZE);
+ pos += QDF_MAC_ADDR_SIZE;
+ freeBytes -= QDF_MAC_ADDR_SIZE;
nBytes = snprintf(pos, freeBytes, " %u:%u",
pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]);
@@ -3861,7 +3861,7 @@
pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
pAdapter->sessionId, roamStatus));
switch (roamStatus) {
@@ -4388,7 +4388,7 @@
* in the bssid.
*/
cdf_mem_copy(PMKIDCache[i].BSSID.bytes,
- bssid, CDF_MAC_ADDR_SIZE);
+ bssid, QDF_MAC_ADDR_SIZE);
cdf_mem_copy(PMKIDCache[i].PMKID,
dot11RSNIE.pmkid[i], CSR_RSN_PMKID_SIZE);
}
@@ -5381,7 +5381,7 @@
pMacAddress = (uint8_t *) wrqu->ap_addr.sa_data;
hddLog(LOG1, FL(" " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMacAddress));
cdf_mem_copy(pHddStaCtx->conn_info.bssId.bytes, pMacAddress,
- sizeof(struct cdf_mac_addr));
+ sizeof(struct qdf_mac_addr));
EXIT();
return 0;
@@ -5440,7 +5440,7 @@
eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState) {
cdf_mem_copy(wrqu->ap_addr.sa_data,
pHddStaCtx->conn_info.bssId.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
} else {
memset(wrqu->ap_addr.sa_data, 0, sizeof(wrqu->ap_addr.sa_data));
}
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index 194af13..dd95af0 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -40,7 +40,7 @@
#include <wlan_hdd_assoc.h>
#include <wlan_hdd_cfg.h>
#include <linux/string.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
#include <csr_api.h>
#include <wlan_hdd_misc.h>
#include <wlan_hdd_napi.h>
@@ -3782,7 +3782,7 @@
char configStr[CFG_ENTRY_MAX_LEN];
char *fmt;
void *pField;
- struct cdf_mac_addr *pMacAddr;
+ struct qdf_mac_addr *pMacAddr;
char *pCur = pBuf;
int curlen;
@@ -3810,7 +3810,7 @@
snprintf(valueStr, CFG_VALUE_MAX_LEN, "%s",
(char *)pField);
} else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) {
- pMacAddr = (struct cdf_mac_addr *) pField;
+ pMacAddr = (struct qdf_mac_addr *) pField;
snprintf(valueStr, CFG_VALUE_MAX_LEN,
"%02x:%02x:%02x:%02x:%02x:%02x",
pMacAddr->bytes[0],
@@ -3887,7 +3887,7 @@
for (i = 0; i < entries; i++) {
if (strcmp(iniTable[i].name, name) == 0) {
*value = iniTable[i].value;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Found %s entry for Name=[%s] Value=[%s] ",
WLAN_INI_FILE, name, *value);
return QDF_STATUS_SUCCESS;
@@ -3930,13 +3930,13 @@
{
int i = 0, j = 0, res = 0;
char *candidate = NULL;
- struct cdf_mac_addr macaddr[CDF_MAX_CONCURRENCY_PERSONA];
+ struct qdf_mac_addr macaddr[QDF_MAX_CONCURRENCY_PERSONA];
memset(macaddr, 0, sizeof(macaddr));
for (i = 0; i < num; i++) {
candidate = macTable[i].value;
- for (j = 0; j < CDF_MAC_ADDR_SIZE; j++) {
+ for (j = 0; j < QDF_MAC_ADDR_SIZE; j++) {
res =
hex2bin(&macaddr[i].bytes[j], &candidate[(j << 1)],
1);
@@ -3947,7 +3947,7 @@
cdf_mem_copy((uint8_t *) &pHddCtx->config->
intfMacAddr[i].bytes[0],
(uint8_t *) &macaddr[i].bytes[0],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
}
}
@@ -3977,7 +3977,7 @@
int32_t svalue;
void *pStructBase = pHddCtx->config;
REG_TABLE_ENTRY *pRegEntry = g_registry_table;
- unsigned long cRegTableEntries = CDF_ARRAY_SIZE(g_registry_table);
+ unsigned long cRegTableEntries = QDF_ARRAY_SIZE(g_registry_table);
uint32_t cbOutString;
int i;
int rv;
@@ -4142,7 +4142,7 @@
/* Handle string parameters */
else if (WLAN_PARAM_String == pRegEntry->RegType) {
#ifdef WLAN_CFG_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"RegName = %s, VarOffset %u VarSize %u VarDefault %s",
pRegEntry->RegName, pRegEntry->VarOffset,
pRegEntry->VarSize,
@@ -4184,7 +4184,7 @@
((uint8_t *) pField)[cbOutString] = '\0';
}
} else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) {
- if (pRegEntry->VarSize != CDF_MAC_ADDR_SIZE) {
+ if (pRegEntry->VarSize != QDF_MAC_ADDR_SIZE) {
hddLog(LOGE,
"%s: Invalid VarSize %u for Name=[%s]",
__func__, pRegEntry->VarSize,
@@ -4194,7 +4194,7 @@
candidate = (char *)pRegEntry->VarDefault;
if (match_status == QDF_STATUS_SUCCESS) {
len_value_str = strlen(value_str);
- if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) {
+ if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) {
hddLog(LOGE,
"%s: Invalid MAC addr [%s] specified for Name=[%s] in %s",
__func__, value_str,
@@ -4204,7 +4204,7 @@
candidate = value_str;
}
/* parse the string and store it in the byte array */
- for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) {
+ for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) {
((char *)pField)[i] =
(char)(parse_hex_digit(candidate[i * 2]) *
16 +
@@ -4416,17 +4416,17 @@
case WLAN_PARAM_MacAddr:
len_value_str = strlen(value_str);
- if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) {
+ if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) {
/* out of range */
hddLog(LOGE,
"%s: invalid command, MAC address [%s] length "
"%zu is not expected length %u",
__func__, value_str,
- len_value_str, (CDF_MAC_ADDR_SIZE * 2));
+ len_value_str, (QDF_MAC_ADDR_SIZE * 2));
goto done;
}
/* parse the string and store it in the byte array */
- for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) {
+ for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) {
((char *)pField)[i] = (char)
((parse_hex_digit(value_str[(i * 2)]) * 16) +
parse_hex_digit(value_str[(i * 2) + 1]));
@@ -4499,515 +4499,515 @@
{
int i;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"*********Config values in HDD Adapter*******");
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [RTSThreshold] Value = %u",
pHddCtx->config->RTSThreshold);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [OperatingChannel] Value = [%u]",
pHddCtx->config->OperatingChannel);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [PowerUsageControl] Value = [%s]",
pHddCtx->config->PowerUsageControl);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fIsImpsEnabled] Value = [%u]",
pHddCtx->config->fIsImpsEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nVccRssiTrigger] Value = [%u]",
pHddCtx->config->nVccRssiTrigger);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]",
MAC_ADDR_ARRAY(pHddCtx->config->IbssBssid.bytes));
- for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]",
i, MAC_ADDR_ARRAY(pHddCtx->config->intfMacAddr[i].bytes));
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApEnableUapsd] value = [%u]",
pHddCtx->config->apUapsdEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableApProt] value = [%u]",
pHddCtx->config->apProtEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gAPAutoShutOff] Value = [%u]",
pHddCtx->config->nAPAutoShutOff);
#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gWlanMccToSccSwitchMode] Value = [%u]",
pHddCtx->config->WlanMccToSccSwitchMode);
#endif
#ifdef FEATURE_WLAN_AUTO_SHUTDOWN
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gWlanAutoShutdown] Value = [%u]",
pHddCtx->config->WlanAutoShutdown);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableListenMode] Value = [%u]",
pHddCtx->config->nEnableListenMode);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApProtection] value = [%u]",
pHddCtx->config->apProtection);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableApOBSSProt] value = [%u]",
pHddCtx->config->apOBSSProtEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS,
pHddCtx->config->force_sap_acs);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH,
pHddCtx->config->force_sap_acs_st_ch);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH,
pHddCtx->config->force_sap_acs_end_ch);
#ifdef FEATURE_AP_MCC_CH_AVOIDANCE
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [sap_channel_avoidance] value = [%u]",
pHddCtx->config->sap_channel_avoidance);
#endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME,
pHddCtx->config->sap_p2p_11ac_override);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [ChannelBondingMode] Value = [%u]",
pHddCtx->config->nChannelBondingMode24GHz);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [ChannelBondingMode] Value = [%u]",
pHddCtx->config->nChannelBondingMode5GHz);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [dot11Mode] Value = [%u]",
pHddCtx->config->dot11Mode);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [UapsdMask] Value = [0x%x] ",
pHddCtx->config->UapsdMask);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [ImplicitQosIsEnabled] Value = [%u]",
(int)pHddCtx->config->bImplicitQosEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdVoSrvIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdVoSrvIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdVoSuspIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdVoSuspIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdViSrvIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdViSrvIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdViSuspIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdViSuspIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdBeSrvIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdBeSrvIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdBeSuspIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdBeSuspIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdBkSrvIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdBkSrvIntv);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraUapsdBkSuspIntv] Value = [%u] ",
pHddCtx->config->InfraUapsdBkSuspIntv);
#ifdef FEATURE_WLAN_ESE
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraInactivityInterval] Value = [%u] ",
pHddCtx->config->InfraInactivityInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [EseEnabled] Value = [%u] ",
pHddCtx->config->isEseIniFeatureEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [FastTransitionEnabled] Value = [%u] ",
pHddCtx->config->isFastTransitionEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gTxPowerCap] Value = [%u] dBm ",
pHddCtx->config->nTxPowerCap);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [FastRoamEnabled] Value = [%u] ",
pHddCtx->config->isFastRoamIniFeatureEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [MAWCEnabled] Value = [%u] ",
pHddCtx->config->MAWCEnabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [RoamRssiDiff] Value = [%u] ",
pHddCtx->config->RoamRssiDiff);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [isWESModeEnabled] Value = [%u] ",
pHddCtx->config->isWESModeEnabled);
#ifdef FEATURE_WLAN_OKC
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [OkcEnabled] Value = [%u] ",
pHddCtx->config->isOkcIniFeatureEnabled);
#endif
#ifdef FEATURE_WLAN_SCAN_PNO
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [configPNOScanSupport] Value = [%u] ",
pHddCtx->config->configPNOScanSupport);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [configPNOScanTimerRepeatValue] Value = [%u] ",
pHddCtx->config->configPNOScanTimerRepeatValue);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gPNOSlowScanMultiplier] Value = [%u] ",
pHddCtx->config->pno_slow_scan_multiplier);
#endif
#ifdef FEATURE_WLAN_TDLS
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fEnableTDLSSupport] Value = [%u] ",
pHddCtx->config->fEnableTDLSSupport);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fEnableTDLSImplicitTrigger] Value = [%u] ",
pHddCtx->config->fEnableTDLSImplicitTrigger);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fTDLSExternalControl] Value = [%u] ",
pHddCtx->config->fTDLSExternalControl);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fTDLSUapsdMask] Value = [%u] ",
pHddCtx->config->fTDLSUapsdMask);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fEnableTDLSBufferSta] Value = [%u] ",
pHddCtx->config->fEnableTDLSBufferSta);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fEnableTDLSWmmMode] Value = [%u] ",
pHddCtx->config->fEnableTDLSWmmMode);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [enable_tdls_scan] Value = [%u]",
pHddCtx->config->enable_tdls_scan);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraDirAcVo] Value = [%u] ",
pHddCtx->config->InfraDirAcVo);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ",
pHddCtx->config->InfraNomMsduSizeAcVo);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMeanDataRateAcVo] Value = [0x%x] ",
pHddCtx->config->InfraMeanDataRateAcVo);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMinPhyRateAcVo] Value = [0x%x] ",
pHddCtx->config->InfraMinPhyRateAcVo);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraSbaAcVo] Value = [0x%x] ",
pHddCtx->config->InfraSbaAcVo);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraDirAcVi] Value = [%u] ",
pHddCtx->config->InfraDirAcVi);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ",
pHddCtx->config->InfraNomMsduSizeAcVi);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMeanDataRateAcVi] Value = [0x%x] ",
pHddCtx->config->InfraMeanDataRateAcVi);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMinPhyRateAcVi] Value = [0x%x] ",
pHddCtx->config->InfraMinPhyRateAcVi);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraSbaAcVi] Value = [0x%x] ",
pHddCtx->config->InfraSbaAcVi);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraDirAcBe] Value = [%u] ",
pHddCtx->config->InfraDirAcBe);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ",
pHddCtx->config->InfraNomMsduSizeAcBe);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMeanDataRateAcBe] Value = [0x%x] ",
pHddCtx->config->InfraMeanDataRateAcBe);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMinPhyRateAcBe] Value = [0x%x] ",
pHddCtx->config->InfraMinPhyRateAcBe);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraSbaAcBe] Value = [0x%x] ",
pHddCtx->config->InfraSbaAcBe);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraDirAcBk] Value = [%u] ",
pHddCtx->config->InfraDirAcBk);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ",
pHddCtx->config->InfraNomMsduSizeAcBk);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMeanDataRateAcBk] Value = [0x%x] ",
pHddCtx->config->InfraMeanDataRateAcBk);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraMinPhyRateAcBk] Value = [0x%x] ",
pHddCtx->config->InfraMinPhyRateAcBk);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [InfraSbaAcBk] Value = [0x%x] ",
pHddCtx->config->InfraSbaAcBk);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [DelayedTriggerFrmInt] Value = [%u] ",
pHddCtx->config->DelayedTriggerFrmInt);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [mcastBcastFilterSetting] Value = [%u] ",
pHddCtx->config->mcastBcastFilterSetting);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fhostArpOffload] Value = [%u] ",
pHddCtx->config->fhostArpOffload);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp);
#ifdef FEATURE_WLAN_RA_FILTERING
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [RArateLimitInterval] Value = [%u] ",
pHddCtx->config->RArateLimitInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [IsRArateLimitEnabled] Value = [%u] ",
pHddCtx->config->IsRArateLimitEnabled);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fFTResourceReqSupported] Value = [%u] ",
pHddCtx->config->fFTResourceReqSupported);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nNeighborLookupRssiThreshold] Value = [%u] ",
pHddCtx->config->nNeighborLookupRssiThreshold);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [delay_before_vdev_stop] Value = [%u] ",
pHddCtx->config->delay_before_vdev_stop);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nOpportunisticThresholdDiff] Value = [%u] ",
pHddCtx->config->nOpportunisticThresholdDiff);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nRoamRescanRssiDiff] Value = [%u] ",
pHddCtx->config->nRoamRescanRssiDiff);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nNeighborScanMinChanTime] Value = [%u] ",
pHddCtx->config->nNeighborScanMinChanTime);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nNeighborScanMaxChanTime] Value = [%u] ",
pHddCtx->config->nNeighborScanMaxChanTime);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nMaxNeighborRetries] Value = [%u] ",
pHddCtx->config->nMaxNeighborReqTries);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nNeighborScanPeriod] Value = [%u] ",
pHddCtx->config->nNeighborScanPeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ",
pHddCtx->config->nNeighborResultsRefreshPeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nEmptyScanRefreshPeriod] Value = [%u] ",
pHddCtx->config->nEmptyScanRefreshPeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nRoamBmissFirstBcnt] Value = [%u] ",
pHddCtx->config->nRoamBmissFirstBcnt);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nRoamBmissFinalBcnt] Value = [%u] ",
pHddCtx->config->nRoamBmissFinalBcnt);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nRoamBeaconRssiWeight] Value = [%u] ",
pHddCtx->config->nRoamBeaconRssiWeight);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [allowDFSChannelRoam] Value = [%u] ",
pHddCtx->config->allowDFSChannelRoam);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nhi_rssi_scan_max_count] Value = [%u] ",
pHddCtx->config->nhi_rssi_scan_max_count);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ",
pHddCtx->config->nhi_rssi_scan_rssi_delta);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nhi_rssi_scan_delay] Value = [%u] ",
pHddCtx->config->nhi_rssi_scan_delay);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ",
pHddCtx->config->nhi_rssi_scan_rssi_ub);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [burstSizeDefinition] Value = [0x%x] ",
pHddCtx->config->burstSizeDefinition);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [tsInfoAckPolicy] Value = [0x%x] ",
pHddCtx->config->tsInfoAckPolicy);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [rfSettlingTimeUs] Value = [%u] ",
pHddCtx->config->rfSettlingTimeUs);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [bSingleTidRc] Value = [%u] ",
pHddCtx->config->bSingleTidRc);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gDynamicPSPollvalue] Value = [%u] ",
pHddCtx->config->dynamicPsPollValue);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gAddTSWhenACMIsOff] Value = [%u] ",
pHddCtx->config->AddTSWhenACMIsOff);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gValidateScanList] Value = [%u] ",
pHddCtx->config->fValidateScanList);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gStaKeepAlivePeriod] Value = [%u] ",
pHddCtx->config->infraStaKeepAlivePeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApDataAvailPollInterVal] Value = [%u] ",
pHddCtx->config->apDataAvailPollPeriodInMs);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [BandCapability] Value = [%u] ",
pHddCtx->config->nBandCapability);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fEnableBeaconEarlyTermination] Value = [%u] ",
pHddCtx->config->fEnableBeaconEarlyTermination);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [teleBcnWakeupEnable] Value = [%u] ",
pHddCtx->config->teleBcnWakeupEn);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [transListenInterval] Value = [%u] ",
pHddCtx->config->nTeleBcnTransListenInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [transLiNumIdleBeacons] Value = [%u] ",
pHddCtx->config->nTeleBcnTransLiNumIdleBeacons);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [maxListenInterval] Value = [%u] ",
pHddCtx->config->nTeleBcnMaxListenInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [maxLiNumIdleBeacons] Value = [%u] ",
pHddCtx->config->nTeleBcnMaxLiNumIdleBeacons);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [bcnEarlyTermWakeInterval] Value = [%u] ",
pHddCtx->config->bcnEarlyTermWakeInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApDataAvailPollInterVal] Value = [%u] ",
pHddCtx->config->apDataAvailPollPeriodInMs);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableBypass11d] Value = [%u] ",
pHddCtx->config->enableBypass11d);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableDFSChnlScan] Value = [%u] ",
pHddCtx->config->enableDFSChnlScan);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableDFSPnoChnlScan] Value = [%u] ",
pHddCtx->config->enable_dfs_pno_chnl_scan);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gReportMaxLinkSpeed] Value = [%u] ",
pHddCtx->config->reportMaxLinkSpeed);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [thermalMitigationEnable] Value = [%u] ",
pHddCtx->config->thermalMitigationEnable);
#ifdef WLAN_FEATURE_11AC
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gVhtChannelWidth] value = [%u]",
pHddCtx->config->vhtChannelWidth);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [enableFirstScan2GOnly] Value = [%u] ",
pHddCtx->config->enableFirstScan2GOnly);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [skipDfsChnlInP2pSearch] Value = [%u] ",
pHddCtx->config->skipDfsChnlInP2pSearch);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ",
pHddCtx->config->ignoreDynamicDtimInP2pMode);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [enableRxSTBC] Value = [%u] ",
pHddCtx->config->enableRxSTBC);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableLpwrImgTransition] Value = [%u] ",
pHddCtx->config->enableLpwrImgTransition);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableSSR] Value = [%u] ",
pHddCtx->config->enableSSR);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableVhtFor24GHzBand] Value = [%u] ",
pHddCtx->config->enableVhtFor24GHzBand);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gFlexConnectPowerFactor] Value = [%u] ",
pHddCtx->config->flexConnectPowerFactor);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableIbssHeartBeatOffload] Value = [%u] ",
pHddCtx->config->enableIbssHeartBeatOffload);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gAntennaDiversity] Value = [%u] ",
pHddCtx->config->antennaDiversity);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gGoLinkMonitorPeriod] Value = [%u]",
pHddCtx->config->goLinkMonitorPeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApLinkMonitorPeriod] Value = [%u]",
pHddCtx->config->apLinkMonitorPeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gGoKeepAlivePeriod] Value = [%u]",
pHddCtx->config->goKeepAlivePeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gApKeepAlivePeriod]Value = [%u]",
pHddCtx->config->apKeepAlivePeriod);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gAmsduSupportInAMPDU] Value = [%u] ",
pHddCtx->config->isAmsduSupportInAMPDU);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nSelect5GHzMargin] Value = [%u] ",
pHddCtx->config->nSelect5GHzMargin);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gCoalesingInIBSS] Value = [%u] ",
pHddCtx->config->isCoalesingInIBSSAllowed);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssATIMWinSize] Value = [%u] ",
pHddCtx->config->ibssATIMWinSize);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssIsPowerSaveAllowed] Value = [%u] ",
pHddCtx->config->isIbssPowerSaveAllowed);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ",
pHddCtx->config->isIbssPowerCollapseAllowed);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssAwakeOnTxRx] Value = [%u] ",
pHddCtx->config->isIbssAwakeOnTxRx);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssInactivityTime] Value = [%u] ",
pHddCtx->config->ibssInactivityCount);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssTxSpEndInactivityTime] Value = [%u] ",
pHddCtx->config->ibssTxSpEndInactivityTime);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssPsWarmupTime] Value = [%u] ",
pHddCtx->config->ibssPsWarmupTime);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIbssPs1RxChainInAtim] Value = [%u] ",
pHddCtx->config->ibssPs1RxChainInAtimEnable);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fDfsPhyerrFilterOffload] Value = [%u] ",
pHddCtx->config->fDfsPhyerrFilterOffload);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIgnorePeerErpInfo] Value = [%u] ",
pHddCtx->config->ignore_peer_erp_info);
#ifdef IPA_OFFLOAD
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIPAConfig] Value = [0x%x] ",
pHddCtx->config->IpaConfig);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIPADescSize] Value = [%u] ",
pHddCtx->config->IpaDescSize);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [IpaHighBandwidthMbpsg] Value = [%u] ",
pHddCtx->config->IpaHighBandwidthMbps);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [IpaMediumBandwidthMbps] Value = [%u] ",
pHddCtx->config->IpaMediumBandwidthMbps);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [IpaLowBandwidthMbps] Value = [%u] ",
pHddCtx->config->IpaLowBandwidthMbps);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableOverLapCh] Value = [%u] ",
pHddCtx->config->gEnableOverLapCh);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gMaxOffloadPeers] Value = [%u] ",
pHddCtx->config->apMaxOffloadPeers);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gMaxOffloadReorderBuffs] value = [%u] ",
pHddCtx->config->apMaxOffloadReorderBuffs);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gAllowDFSChannelRoam] Value = [%u] ",
pHddCtx->config->allowDFSChannelRoam);
hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
@@ -5015,184 +5015,184 @@
pHddCtx->config->gMaxConcurrentActiveSessions);
#ifdef MSM_PLATFORM
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gBusBandwidthHighThreshold] Value = [%u] ",
pHddCtx->config->busBandwidthHighThreshold);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gBusBandwidthMediumThreshold] Value = [%u] ",
pHddCtx->config->busBandwidthMediumThreshold);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gBusBandwidthLowThreshold] Value = [%u] ",
pHddCtx->config->busBandwidthLowThreshold);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gbusBandwidthComputeInterval] Value = [%u] ",
pHddCtx->config->busBandwidthComputeInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gTcpDelAckThresholdHigh] Value = [%u] ",
pHddCtx->config->tcpDelackThresholdHigh);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gTcpDelAckThresholdLow] Value = [%u] ",
pHddCtx->config->tcpDelackThresholdLow);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [%s] Value = [%u] ",
CFG_TCP_TX_HIGH_TPUT_THRESHOLD_NAME,
pHddCtx->config->tcp_tx_high_tput_thres);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gIgnoreCAC] Value = [%u] ",
pHddCtx->config->ignoreCAC);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gSapPreferredChanLocation] Value = [%u] ",
pHddCtx->config->gSapPreferredChanLocation);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gDisableDfsJapanW53] Value = [%u] ",
pHddCtx->config->gDisableDfsJapanW53);
#ifdef FEATURE_GREEN_AP
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableGreenAp] Value = [%u] ",
pHddCtx->config->enableGreenAP);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEenableEGAP] Value = [%u] ",
pHddCtx->config->enable_egap);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEGAPInactTime] Value = [%u] ",
pHddCtx->config->egap_inact_time);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEGAPWaitTime] Value = [%u] ",
pHddCtx->config->egap_wait_time);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEGAPFeatures] Value = [%u] ",
pHddCtx->config->egap_feature_flag);
#endif
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [isRoamOffloadEnabled] Value = [%u]",
pHddCtx->config->isRoamOffloadEnabled);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableSifsBurst] Value = [%u]",
pHddCtx->config->enableSifsBurst);
#ifdef WLAN_FEATURE_LPSS
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableLpassSupport] Value = [%u] ",
pHddCtx->config->enable_lpass_support);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableSelfRecovery] Value = [%u]",
pHddCtx->config->enableSelfRecovery);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableSapSuspend] Value = [%u]",
pHddCtx->config->enableSapSuspend);
#ifdef WLAN_FEATURE_EXTWOW_SUPPORT
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWgotoSuspend] Value = [%u]",
pHddCtx->config->extWowGotoSuspend);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWowApp1WakeupPinNumber] Value = [%u]",
pHddCtx->config->extWowApp1WakeupPinNumber);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWowApp2WakeupPinNumber] Value = [%u]",
pHddCtx->config->extWowApp2WakeupPinNumber);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]",
pHddCtx->config->extWowApp2KAInitPingInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]",
pHddCtx->config->extWowApp2KAMinPingInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]",
pHddCtx->config->extWowApp2KAMaxPingInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]",
pHddCtx->config->extWowApp2KAIncPingInterval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2TcpSrcPort] Value = [%u]",
pHddCtx->config->extWowApp2TcpSrcPort);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2TcpDstPort] Value = [%u]",
pHddCtx->config->extWowApp2TcpDstPort);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]",
pHddCtx->config->extWowApp2TcpTxTimeout);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]",
pHddCtx->config->extWowApp2TcpRxTimeout);
#endif
#ifdef DHCP_SERVER_OFFLOAD
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gDHCPServerOffloadEnable] Value = [%u]",
pHddCtx->config->enableDHCPServerOffload);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gDHCPMaxNumClients] Value = [%u]",
pHddCtx->config->dhcpMaxNumClients);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gDHCPServerIP] Value = [%s]",
pHddCtx->config->dhcpServerIP);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gEnableDumpCollect] Value = [%u]",
pHddCtx->config->is_ramdump_enabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [gP2PListenDeferInterval] Value = [%u]",
pHddCtx->config->p2p_listen_defer_interval);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [is_ps_enabled] value = [%d]",
pHddCtx->config->is_ps_enabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [policy_manager_enabled] value = [%d]",
pHddCtx->config->policy_manager_enabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [tso_enable] value = [%d]",
pHddCtx->config->tso_enable);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [LROEnable] value = [%d]",
pHddCtx->config->lro_enable);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [active_mode_offload] value = [%d]",
pHddCtx->config->active_mode_offload);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [gfine_time_meas_cap] value = [%u]",
pHddCtx->config->fine_time_meas_cap);
#ifdef WLAN_FEATURE_FASTPATH
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [fastpath_enable] Value = [%u]",
pHddCtx->config->fastpath_enable);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [max_scan_count] value = [%d]",
pHddCtx->config->max_scan_count);
#ifdef FEATURE_NAPI_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [%s] value = [%d]",
CFG_ENABLE_RX_THREAD, pHddCtx->config->enableRxThread);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [%s] value = [%d]",
CFG_NAPI_NAME, pHddCtx->config->napi_enable);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [%s] Value = [%u]",
CFG_CE_CLASSIFY_ENABLE_NAME,
pHddCtx->config->ce_classify_enabled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Name = [%s] value = [%u]",
CFG_DUAL_MAC_FEATURE_DISABLE,
pHddCtx->config->dual_mac_feature_disable);
@@ -5250,7 +5250,7 @@
const struct firmware *fw = NULL;
char *line, *buffer = NULL;
char *name, *value;
- tCfgIniEntry macTable[CDF_MAX_CONCURRENCY_PERSONA];
+ tCfgIniEntry macTable[QDF_MAX_CONCURRENCY_PERSONA];
tSirMacAddr customMacAddr;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -5299,14 +5299,14 @@
value = buffer;
macTable[i].name = name;
macTable[i++].value = value;
- if (i >= CDF_MAX_CONCURRENCY_PERSONA)
+ if (i >= QDF_MAX_CONCURRENCY_PERSONA)
break;
}
}
}
buffer = line;
}
- if (i <= CDF_MAX_CONCURRENCY_PERSONA) {
+ if (i <= QDF_MAX_CONCURRENCY_PERSONA) {
hddLog(CDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided",
__func__, i);
} else {
@@ -6045,7 +6045,7 @@
temp = (temp & 0xFFFC) | pConfig->vhtTxMCS;
if (pConfig->enable2x2)
temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"vhtRxMCS2x2 - %x temp - %u enable2x2 %d",
pConfig->vhtRxMCS2x2, temp,
pConfig->enable2x2);
@@ -6381,13 +6381,13 @@
smeConfig = cdf_mem_malloc(sizeof(*smeConfig));
if (NULL == smeConfig) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: unable to allocate smeConfig", __func__);
return QDF_STATUS_E_NOMEM;
}
cdf_mem_zero(smeConfig, sizeof(*smeConfig));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d",
__func__, pConfig->WmmMode, pConfig->b80211eIsEnabled,
pConfig->dot11Mode);
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index ce41c1e..70033c2 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -60,7 +60,7 @@
#include "wlan_hdd_main.h"
#include "wlan_hdd_power.h"
#include "wlan_hdd_trace.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "cdf_trace.h"
#include "cds_utils.h"
#include "cds_sched.h"
@@ -671,7 +671,7 @@
struct sk_buff *skb;
uint32_t set = 0;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1106,7 +1106,7 @@
if (ret_val)
return ret_val;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1346,7 +1346,7 @@
acs_event_callback = hdd_hostapd_sap_event_cb;
cdf_mem_copy(sap_config->self_macaddr.bytes,
- adapter->macAddressCurrent.bytes, sizeof(struct cdf_mac_addr));
+ adapter->macAddressCurrent.bytes, sizeof(struct qdf_mac_addr));
hddLog(LOG1, FL("ACS Started for wlan%d"), adapter->dev->ifindex);
status = wlansap_acs_chselect(
#ifdef WLAN_FEATURE_MBSSID
@@ -1413,7 +1413,7 @@
* [QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST] = { .type = NLA_NESTED },
*/
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1802,7 +1802,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1943,7 +1943,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2068,7 +2068,7 @@
if (ret_val)
return ret_val;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2187,7 +2187,7 @@
uint32_t buf_len = 0;
int ret;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2379,7 +2379,7 @@
}
nla_memcpy(roam_params.bssid_favored[i].bytes,
tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_BSSID],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
hdd_debug(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_params.bssid_favored[i].bytes));
/* Parse and fetch preference factor*/
@@ -2424,7 +2424,7 @@
}
nla_memcpy(roam_params.bssid_avoid_list[i].bytes,
tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_BSSID],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
hdd_debug(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(
roam_params.bssid_avoid_list[i].bytes));
@@ -2717,7 +2717,7 @@
hdd_context_t *hdd_ctx_ptr;
int status;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2806,7 +2806,7 @@
int status;
struct sk_buff *reply_skb = NULL;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2903,7 +2903,7 @@
uint32_t features;
struct sk_buff *reply_skb = NULL;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3137,7 +3137,7 @@
u32 guard_time;
QDF_STATUS status;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3256,7 +3256,7 @@
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1];
struct sir_wifi_start_log start_log;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3380,7 +3380,7 @@
struct nlattr *tb
[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_GET_RING_DATA_MAX + 1];
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3556,7 +3556,7 @@
QDF_STATUS status;
uint32_t request_id, ret, len;
uint8_t pattern_id = 0;
- struct cdf_mac_addr dst_addr;
+ struct qdf_mac_addr dst_addr;
uint16_t eth_type = htons(ETH_P_IP);
if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) {
@@ -3599,7 +3599,7 @@
goto fail;
}
nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
hddLog(LOG1, "input src mac address: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(add_req->mac_address.bytes));
@@ -3613,7 +3613,7 @@
hddLog(LOGE, FL("attr dst mac address failed"));
goto fail;
}
- nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], CDF_MAC_ADDR_SIZE);
+ nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE);
hddLog(LOG1, "input dst mac address: "MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(dst_addr.bytes));
@@ -3633,11 +3633,11 @@
}
len = 0;
- cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, CDF_MAC_ADDR_SIZE);
- len += CDF_MAC_ADDR_SIZE;
+ cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, QDF_MAC_ADDR_SIZE);
+ len += QDF_MAC_ADDR_SIZE;
cdf_mem_copy(&add_req->ucPattern[len], add_req->mac_address.bytes,
- CDF_MAC_ADDR_SIZE);
- len += CDF_MAC_ADDR_SIZE;
+ QDF_MAC_ADDR_SIZE);
+ len += QDF_MAC_ADDR_SIZE;
cdf_mem_copy(&add_req->ucPattern[len], ð_type, 2);
len += 2;
@@ -3766,15 +3766,15 @@
[PARAM_REQUEST_ID] = { .type = NLA_U32 },
[PARAM_CONTROL] = { .type = NLA_U32 },
[PARAM_SRC_MAC_ADDR] = { .type = NLA_BINARY,
- .len = CDF_MAC_ADDR_SIZE },
+ .len = QDF_MAC_ADDR_SIZE },
[PARAM_DST_MAC_ADDR] = { .type = NLA_BINARY,
- .len = CDF_MAC_ADDR_SIZE },
+ .len = QDF_MAC_ADDR_SIZE },
[PARAM_PERIOD] = { .type = NLA_U32 },
};
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -4317,7 +4317,7 @@
hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_station_ctx_t *hdd_sta_ctx;
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX+1];
- uint8_t peer_mac[CDF_MAC_ADDR_SIZE];
+ uint8_t peer_mac[QDF_MAC_ADDR_SIZE];
uint32_t sta_id;
struct sk_buff *reply_skb;
uint32_t rate_flags = 0;
@@ -4327,7 +4327,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -4349,7 +4349,7 @@
}
cdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]),
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
hddLog(CDF_TRACE_LEVEL_INFO,
FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"),
MAC_ADDR_ARRAY(peer_mac), adapter->device_mode);
@@ -4360,7 +4360,7 @@
if ((hdd_sta_ctx->conn_info.connState !=
eConnectionState_Associated) ||
!cdf_mem_compare(hdd_sta_ctx->conn_info.bssId.bytes,
- peer_mac, CDF_MAC_ADDR_SIZE)) {
+ peer_mac, QDF_MAC_ADDR_SIZE)) {
hddLog(CDF_TRACE_LEVEL_ERROR,
FL("Not Associated to mac "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(peer_mac));
@@ -4380,7 +4380,7 @@
&adapter->aStaInfo[sta_id].macAddrSTA) &&
cdf_mem_compare(
&adapter->aStaInfo[sta_id].macAddrSTA.bytes,
- peer_mac, CDF_MAC_ADDR_SIZE))
+ peer_mac, QDF_MAC_ADDR_SIZE))
break;
}
@@ -4510,7 +4510,7 @@
QDF_STATUS status;
uint32_t current_roam_state;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -5368,7 +5368,7 @@
#endif /*FEATURE_WLAN_SCAN_PNO */
#if defined QCA_WIFI_FTM
- if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) {
+ if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) {
#endif
/* even with WIPHY_FLAG_CUSTOM_REGULATORY,
@@ -5473,7 +5473,7 @@
wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
wiphy->max_remain_on_channel_duration = MAX_REMAIN_ON_CHANNEL_DURATION;
- if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) {
+ if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) {
wiphy->n_vendor_commands =
ARRAY_SIZE(hdd_wiphy_vendor_commands);
wiphy->vendor_commands = hdd_wiphy_vendor_commands;
@@ -5683,7 +5683,7 @@
if (!mac_addr || is_broadcast_ether_addr(mac_addr)) {
cdf_set_macaddr_broadcast(&setKey.peerMac);
} else {
- cdf_mem_copy(setKey.peerMac.bytes, mac_addr, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE);
}
setKey.keyLength = key_Len;
pKeyPtr = setKey.Key;
@@ -5701,7 +5701,7 @@
pAdapter->sessionId, &setKey, &roamId);
}
if (status != 0) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"[%4d] sme_roam_set_key returned ERROR status= %d",
__LINE__, status);
pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE;
@@ -5861,12 +5861,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CHANGE_BSS,
pAdapter->sessionId, params->ap_isolate));
hddLog(LOG1, FL("Device_mode %s(%d), ap_isolate = %d"),
@@ -6016,7 +6016,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -6026,7 +6026,7 @@
if (0 != status)
return status;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CHANGE_IFACE,
pAdapter->sessionId, type));
@@ -6120,7 +6120,7 @@
ndev->dev_addr[3] |= 0xF0;
memcpy(pAdapter->macAddressCurrent.
bytes, ndev->dev_addr,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
pr_info("wlan: Generated HotSpot BSSID "
MAC_ADDRESS_STR "\n",
MAC_ADDR_ARRAY(ndev->dev_addr));
@@ -6301,7 +6301,7 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_context_t *pHddCtx;
hdd_station_ctx_t *pHddStaCtx;
- struct cdf_mac_addr STAMacAddress;
+ struct qdf_mac_addr STAMacAddress;
#ifdef FEATURE_WLAN_TDLS
tCsrStaParams StaParams = { 0 };
uint8_t isBufSta = 0;
@@ -6311,12 +6311,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CHANGE_STATION,
pAdapter->sessionId, params->listen_interval));
@@ -6327,7 +6327,7 @@
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- cdf_mem_copy(STAMacAddress.bytes, mac, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(STAMacAddress.bytes, mac, QDF_MAC_ADDR_SIZE);
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) ||
(pAdapter->device_mode == WLAN_HDD_P2P_GO)) {
@@ -6358,7 +6358,7 @@
* are an incremental of 1 else an incremental of 4 till the number
* of channels.
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: params->supported_channels_len: %d",
__func__, params->supported_channels_len);
if (0 != params->supported_channels_len) {
@@ -6385,7 +6385,7 @@
no_of_channels =
params->supported_channels[i + 1];
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d, wifi_chan_index: %d, no_of_channels: %d",
__func__, i, j, k, j,
@@ -6409,7 +6409,7 @@
} else {
continue;
}
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d",
__func__, i, j, k,
@@ -6421,11 +6421,11 @@
}
}
num_unique_channels = j + 1;
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: Unique Channel List", __func__);
for (i = 0; i < num_unique_channels; i++) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: StaParams.supported_channels[%d]: %d,",
__func__, i,
@@ -6436,7 +6436,7 @@
num_unique_channels = MAX_CHANNEL;
StaParams.supported_channels_len =
num_unique_channels;
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: After removing duplcates StaParams.supported_channels_len: %d",
__func__,
@@ -6480,13 +6480,13 @@
cdf_mem_copy(StaParams.supported_rates,
params->supported_rates,
StaParams.supported_rates_len);
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"Supported Rates with Length %d",
StaParams.supported_rates_len);
for (i = 0; i < StaParams.supported_rates_len;
i++)
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"[%d]: %0x", i,
StaParams.supported_rates[i]);
@@ -6594,12 +6594,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_ADD_KEY,
pAdapter->sessionId, params->key_len));
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -6722,16 +6722,16 @@
if (!pairwise) {
/* set group key */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s- %d: setting Broadcast key", __func__, __LINE__);
setKey.keyDirection = eSIR_RX_ONLY;
cdf_set_macaddr_broadcast(&setKey.peerMac);
} else {
/* set pairwise key */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s- %d: setting pairwise key", __func__, __LINE__);
setKey.keyDirection = eSIR_TX_RX;
- cdf_mem_copy(setKey.peerMac.bytes, mac_addr, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE);
}
if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) {
/* if a key is already installed, block all subsequent ones */
@@ -6772,7 +6772,7 @@
status = wlansap_set_key_sta(p_cds_context, &setKey);
#endif
if (status != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"[%4d] wlansap_set_key_sta returned ERROR status= %d",
__LINE__, status);
@@ -6799,7 +6799,7 @@
if (!pairwise) {
/* set group key */
if (pHddStaCtx->roam_info.deferKeyComplete) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s- %d: Perform Set key Complete",
__func__, __LINE__);
@@ -6926,7 +6926,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -6971,7 +6971,7 @@
break;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_GET_KEY,
pAdapter->sessionId, params.cipher));
@@ -7078,12 +7078,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY,
pAdapter->sessionId, key_index));
@@ -7422,7 +7422,7 @@
bss_desc->rssi;
/* Supplicant takes the signal strength in terms of mBm(100*dBm) */
- rssi = CDF_MIN(rssi, 0) * 100;
+ rssi = QDF_MIN(rssi, 0) * 100;
hddLog(LOG1, FL("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d"),
MAC_ADDR_ARRAY(mgmt->bssid), chan->center_freq,
@@ -7494,7 +7494,7 @@
ENTER();
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_UPDATE_BSS,
NO_SESSION, pAdapter->sessionId));
@@ -7850,29 +7850,29 @@
if (bssid) {
pRoamProfile->BSSIDs.numOfBSSIDs = 1;
cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid),
- bssid, CDF_MAC_ADDR_SIZE);
+ bssid, QDF_MAC_ADDR_SIZE);
/* Save BSSID in seperate variable as well, as RoamProfile
BSSID is getting zeroed out in the association process. And in
case of join failure we should send valid BSSID to supplicant
*/
cdf_mem_copy((void *)(pWextState->req_bssId.bytes),
- bssid, CDF_MAC_ADDR_SIZE);
+ bssid, QDF_MAC_ADDR_SIZE);
} else if (bssid_hint) {
pRoamProfile->BSSIDs.numOfBSSIDs = 1;
cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid),
- bssid_hint, CDF_MAC_ADDR_SIZE);
+ bssid_hint, QDF_MAC_ADDR_SIZE);
/* Save BSSID in separate variable as well, as
RoamProfile BSSID is getting zeroed out in the
association process. And in case of join failure
we should send valid BSSID to supplicant
*/
cdf_mem_copy((void *)(pWextState->req_bssId.bytes),
- bssid_hint, CDF_MAC_ADDR_SIZE);
+ bssid_hint, QDF_MAC_ADDR_SIZE);
hddLog(LOGW, FL(" bssid_hint "MAC_ADDRESS_STR),
MAC_ADDR_ARRAY(bssid_hint));
} else {
cdf_mem_zero((void *)(pRoamProfile->BSSIDs.bssid),
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
hddLog(LOG1, FL("Connect to SSID: %.*s operating Channel: %u"),
@@ -8817,12 +8817,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CONNECT,
pAdapter->sessionId, pAdapter->device_mode));
hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -9080,12 +9080,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_DISCONNECT,
pAdapter->sessionId, reason));
hddLog(LOG1, FL("Device_mode %s(%d) reason code(%d)"),
@@ -9309,17 +9309,17 @@
int status;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- struct cdf_mac_addr bssid;
+ struct qdf_mac_addr bssid;
u8 channelNum = 0;
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_JOIN_IBSS,
pAdapter->sessionId, pAdapter->device_mode));
hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -9425,7 +9425,7 @@
FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID"));
return -EIO;
}
- cdf_mem_copy(bssid.bytes, params->bssid, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(bssid.bytes, params->bssid, QDF_MAC_ADDR_SIZE);
} else if (pHddCtx->config->isCoalesingInIBSSAllowed == 0) {
if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0)
== QDF_STATUS_E_FAILURE) {
@@ -9524,12 +9524,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_LEAVE_IBSS,
pAdapter->sessionId,
eCSR_DISCONNECT_REASON_IBSS_LEAVE));
@@ -9621,12 +9621,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS,
NO_SESSION, wiphy->rts_threshold));
status = wlan_hdd_validate_context(pHddCtx);
@@ -9837,12 +9837,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_DEL_STA,
pAdapter->sessionId, pAdapter->device_mode));
@@ -9863,7 +9863,7 @@
return 0;
}
- if (cdf_is_macaddr_broadcast((struct cdf_mac_addr *) mac)) {
+ if (cdf_is_macaddr_broadcast((struct qdf_mac_addr *) mac)) {
uint16_t i;
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if ((pAdapter->aStaInfo[i].isUsed) &&
@@ -9873,7 +9873,7 @@
mac,
pAdapter->aStaInfo[i].
macAddrSTA.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
if (hdd_ipa_uc_is_enabled(pHddCtx)) {
hdd_ipa_wlan_evt(pAdapter,
pAdapter->
@@ -9915,7 +9915,7 @@
} else {
qdf_status =
hdd_softap_get_sta_id(pAdapter,
- (struct cdf_mac_addr *) mac,
+ (struct qdf_mac_addr *) mac,
&staId);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hddLog(LOG1,
@@ -10057,12 +10057,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_ADD_STA,
pAdapter->sessionId, params->listen_interval));
@@ -10136,7 +10136,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -10162,14 +10162,14 @@
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
- cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, QDF_MAC_ADDR_SIZE);
cdf_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE);
/* Add to the PMKSA ID Cache in CSR */
result = sme_roam_set_pmkid_cache(halHandle, pAdapter->sessionId,
&pmk_id, 1, false);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_PMKSA,
pAdapter->sessionId, result));
@@ -10217,7 +10217,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -10242,7 +10242,7 @@
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_DEL_PMKSA,
pAdapter->sessionId, 0));
/* Delete the PMKID CSR cache */
@@ -10297,7 +10297,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -10368,12 +10368,12 @@
if (status)
return status;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES,
pAdapter->sessionId, pHddStaCtx->conn_info.connState));
/* Added for debug on reception of Re-assoc Req. */
@@ -10499,12 +10499,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA,
pAdapter->sessionId, pAdapter->device_mode));
@@ -10611,7 +10611,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -10638,7 +10638,7 @@
hddLog(LOGE, "acl policy: = %d no acl entries = %d", params->acl_policy,
params->n_acl_entries);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_MAC_ACL,
pAdapter->sessionId, pAdapter->device_mode));
if (WLAN_HDD_SOFTAP == pAdapter->device_mode) {
@@ -10824,7 +10824,7 @@
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TESTMODE,
NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])));
switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) {
@@ -10945,15 +10945,15 @@
hdd_context_t *hdd_ctx;
if (!buf || !buf_len) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: buf or buf_len invalid, buf = %p buf_len = %zu",
__func__, buf, buf_len);
return;
}
- hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: hdd context invalid", __func__);
return;
}
@@ -10961,7 +10961,7 @@
skb = cfg80211_testmode_alloc_event_skb(hdd_ctx->wiphy,
buf_len, GFP_KERNEL);
if (!skb) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: failed to allocate testmode rx skb!", __func__);
return;
}
@@ -10977,7 +10977,7 @@
nla_put_failure:
kfree_skb(skb);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: nla_put failed on testmode rx skb!", __func__);
}
#endif
@@ -11003,7 +11003,7 @@
tSmeConfigParams sme_config;
bool cbModeChange;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c
index c3cda33..69d1b13 100644
--- a/core/hdd/src/wlan_hdd_conc_ut.c
+++ b/core/hdd/src/wlan_hdd_conc_ut.c
@@ -35,7 +35,7 @@
#include "wlan_hdd_trace.h"
#include "cds_concurrency.h"
#include "wlan_hdd_conc_ut.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "cdf_trace.h"
#include "cds_utils.h"
#include "cds_reg_service.h"
diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c
index 9af6336..771d9ba 100644
--- a/core/hdd/src/wlan_hdd_debugfs.c
+++ b/core/hdd/src/wlan_hdd_debugfs.c
@@ -69,7 +69,7 @@
pAdapter = (hdd_adapter_t *)file->private_data;
if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s: Invalid adapter or adapter has invalid magic.",
__func__);
@@ -83,7 +83,7 @@
if (!sme_is_feature_supported_by_fw(WOW)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Wake-on-Wireless feature is not supported in firmware!",
__func__);
@@ -91,7 +91,7 @@
}
if (count > MAX_USER_COMMAND_SIZE_WOWL_ENABLE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Command length is larger than %d bytes.",
__func__, MAX_USER_COMMAND_SIZE_WOWL_ENABLE);
@@ -114,7 +114,7 @@
/* Disable wow */
if (!wow_enable) {
if (!hdd_exit_wowl(pAdapter)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: hdd_exit_wowl failed!", __func__);
return -EFAULT;
@@ -142,7 +142,7 @@
wow_pbm = 1;
if (!hdd_enter_wowl(pAdapter, wow_mp, wow_pbm)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: hdd_enter_wowl failed!", __func__);
return -EFAULT;
@@ -199,7 +199,7 @@
ENTER();
if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s: Invalid adapter or adapter has invalid magic.",
__func__);
@@ -212,7 +212,7 @@
return ret;
if (!sme_is_feature_supported_by_fw(WOW)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Wake-on-Wireless feature is not supported in firmware!",
__func__);
@@ -220,7 +220,7 @@
}
if (count > MAX_USER_COMMAND_SIZE_WOWL_PATTERN) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Command length is larger than %d bytes.",
__func__, MAX_USER_COMMAND_SIZE_WOWL_PATTERN);
@@ -328,7 +328,7 @@
pAdapter = (hdd_adapter_t *)file->private_data;
if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s: Invalid adapter or adapter has invalid magic.",
__func__);
@@ -341,7 +341,7 @@
return ret;
if (!sme_is_feature_supported_by_fw(WLAN_PERIODIC_TX_PTRN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Periodic Tx Pattern Offload feature is not supported in firmware!",
__func__);
return -EINVAL;
@@ -351,7 +351,7 @@
if (count <= MAX_USER_COMMAND_SIZE_FRAME)
cmd = cdf_mem_malloc(count + 1);
else {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Command length is larger than %d bytes.",
__func__, MAX_USER_COMMAND_SIZE_FRAME);
@@ -359,7 +359,7 @@
}
if (!cmd) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Memory allocation for cmd failed!"));
return -ENOMEM;
}
@@ -379,7 +379,7 @@
goto failure;
if (pattern_idx > (MAXNUM_PERIODIC_TX_PTRNS - 1)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Pattern index %d is not in the range (0 ~ %d).",
__func__, pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1);
@@ -398,7 +398,7 @@
delPeriodicTxPtrnParams =
cdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn));
if (!delPeriodicTxPtrnParams) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Memory allocation failed!"));
cdf_mem_free(cmd);
return -ENOMEM;
@@ -412,7 +412,7 @@
status = sme_del_periodic_tx_ptrn(pHddCtx->hHal,
delPeriodicTxPtrnParams);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: sme_del_periodic_tx_ptrn() failed!",
__func__);
@@ -432,7 +432,7 @@
hdd_info("device mode %d", pAdapter->device_mode);
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
(!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Not in Connected state!", __func__);
goto failure;
}
@@ -448,7 +448,7 @@
/* Since the pattern is a hex string, 2 characters represent 1 byte. */
if (pattern_len % 2) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Malformed pattern!", __func__);
goto failure;
@@ -456,7 +456,7 @@
pattern_len >>= 1;
if (pattern_len < 14 || pattern_len > PERIODIC_TX_PTRN_MAX_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Not an 802.3 frame!", __func__);
goto failure;
@@ -464,7 +464,7 @@
addPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn));
if (!addPeriodicTxPtrnParams) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Memory allocation failed!"));
cdf_mem_free(cmd);
return -ENOMEM;
@@ -490,7 +490,7 @@
status = sme_add_periodic_tx_ptrn(pHddCtx->hHal,
addPeriodicTxPtrnParams);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: sme_add_periodic_tx_ptrn() failed!", __func__);
cdf_mem_free(addPeriodicTxPtrnParams);
@@ -548,7 +548,7 @@
adapter = (hdd_adapter_t *)file->private_data;
if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s: Invalid adapter or adapter has invalid magic.",
__func__);
return -EINVAL;
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index f09f1ba..2753733 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -183,7 +183,7 @@
{
QDF_STATUS status;
- status = cds_set_context(CDF_MODULE_ID_HIF, hif);
+ status = cds_set_context(QDF_MODULE_ID_HIF, hif);
if (status)
return -ENOENT;
@@ -200,7 +200,7 @@
{
QDF_STATUS status;
- status = cds_set_context(CDF_MODULE_ID_HIF, NULL);
+ status = cds_set_context(QDF_MODULE_ID_HIF, NULL);
if (status)
hdd_err("Failed to reset CDS HIF Context");
@@ -368,7 +368,7 @@
if (ret)
goto err_epping_close;
- hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
status = ol_cds_init(cdf_dev, hif_ctx);
@@ -455,7 +455,7 @@
hdd_cnss_driver_unloading();
- hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
hif_disable_power_management(hif_ctx);
@@ -483,7 +483,7 @@
*/
static void wlan_hdd_shutdown(void)
{
- void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (cds_is_load_or_unload_in_progress()) {
hdd_err("Load/unload in progress, ignore SSR shutdown");
@@ -514,7 +514,7 @@
*/
void wlan_hdd_crash_shutdown(void)
{
- hif_crash_shutdown(cds_get_context(CDF_MODULE_ID_HIF));
+ hif_crash_shutdown(cds_get_context(QDF_MODULE_ID_HIF));
}
/**
@@ -553,8 +553,8 @@
*/
static int __wlan_hdd_bus_suspend(pm_message_t state)
{
- void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
- void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+ void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
int err = wlan_hdd_validate_context(hdd_ctx);
int status;
@@ -626,8 +626,8 @@
*/
static int __wlan_hdd_bus_resume(void)
{
- void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
- void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+ void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
int status = wlan_hdd_validate_context(hdd_ctx);
if (0 != status) {
@@ -679,8 +679,8 @@
*/
static int __wlan_hdd_runtime_suspend(void)
{
- void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
- void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+ void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
int status = wlan_hdd_validate_context(hdd_ctx);
if (0 != status)
@@ -750,7 +750,7 @@
*/
static int __wlan_hdd_runtime_resume(void)
{
- void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
hif_pre_runtime_resume(hif_ctx);
CDF_BUG(!cnss_auto_resume());
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index d217991..f95bebb 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -721,7 +721,7 @@
if (nla_put(skb,
QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_BSSID,
- CDF_MAC_ADDR_SIZE, ap_info->bssid.bytes) ||
+ QDF_MAC_ADDR_SIZE, ap_info->bssid.bytes) ||
nla_put_u32(skb,
QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_CHANNEL,
ap_info->channel) ||
@@ -1718,7 +1718,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1852,7 +1852,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2000,7 +2000,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2075,7 +2075,7 @@
nla_memcpy(pReqMsg->ap[i].bssid.bytes,
tb2
[QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
hddLog(LOG1, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pReqMsg->ap[i].bssid.bytes));
@@ -2197,7 +2197,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2294,7 +2294,7 @@
nla_memcpy(pReqMsg->ap[i].bssid.bytes,
tb2
[QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
hddLog(LOG1, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pReqMsg->ap[i].bssid.bytes));
@@ -2479,7 +2479,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -2534,7 +2534,7 @@
return -EINVAL;
}
- num_channels = CDF_MIN(num_channels, maxChannels);
+ num_channels = QDF_MIN(num_channels, maxChannels);
hdd_remove_dsrc_channels(wiphy, chan_list, &num_channels);
@@ -2831,7 +2831,7 @@
num_channels);
req_msg->buckets[bkt_index].numChannels =
- CDF_MIN(num_channels,
+ QDF_MIN(num_channels,
(WLAN_EXTSCAN_MAX_CHANNELS -
total_channels));
hdd_info("Adj Num channels/bucket: %d total_channels: %d",
@@ -2926,7 +2926,7 @@
req_msg->buckets[bkt_index].numChannels);
req_msg->buckets[bkt_index].numChannels =
- CDF_MIN(req_msg->buckets[bkt_index].numChannels,
+ QDF_MIN(req_msg->buckets[bkt_index].numChannels,
(WLAN_EXTSCAN_MAX_CHANNELS - total_channels));
hdd_info("Num channels/bucket: %d total_channels: %d",
req_msg->buckets[bkt_index].numChannels,
@@ -3144,7 +3144,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3354,7 +3354,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3481,7 +3481,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3606,7 +3606,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3822,7 +3822,7 @@
if (ret_val)
return ret_val;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -4028,7 +4028,7 @@
if (ret)
return ret;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -4144,7 +4144,7 @@
if (ret)
return ret;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -4270,7 +4270,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -4490,7 +4490,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c
index 645e7a0..e9ff971 100644
--- a/core/hdd/src/wlan_hdd_ftm.c
+++ b/core/hdd/src/wlan_hdd_ftm.c
@@ -35,7 +35,7 @@
#include "cds_sched.h"
#include <cds_api.h>
#include "sir_types.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "sir_api.h"
#include "sir_mac_prot_def.h"
#include "sme_api.h"
@@ -99,7 +99,7 @@
ftmMsg.bodyptr = (uint8_t *) cmd_ptr;
ftmMsg.bodyval = 0;
- if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA,
+ if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
&ftmMsg)) {
hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL",
__func__);
@@ -176,7 +176,7 @@
tMacOpenParameters mac_openParms;
p_cds_contextType gp_cds_context = (p_cds_contextType) p_cds_context;
#if defined(QCA_WIFI_FTM)
- cdf_device_t cdf_ctx;
+ qdf_device_t cdf_ctx;
HTC_INIT_INFO htcInfo;
void *pHifContext = NULL;
void *pHtcContext = NULL;
@@ -184,11 +184,11 @@
#endif
hdd_context_t *hdd_ctx;
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
"%s: Opening CDS", __func__);
if (NULL == gp_cds_context) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Trying to open CDS without a PreOpen", __func__);
CDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
@@ -196,7 +196,7 @@
/* Initialize the probe event */
if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Unable to init probeEvent", __func__);
CDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
@@ -204,7 +204,7 @@
if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Unable to init wmaCompleteEvent", __func__);
CDF_ASSERT(0);
@@ -216,7 +216,7 @@
if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
/* Critical Error ... Cannot proceed further */
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to initialize CDS free message queue %d",
__func__, vStatus);
CDF_ASSERT(0);
@@ -237,7 +237,7 @@
if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
/* Critical Error ... Cannot proceed further */
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to open CDS Scheduler %d", __func__,
vStatus);
CDF_ASSERT(0);
@@ -245,16 +245,16 @@
}
#if defined(QCA_WIFI_FTM)
/* Initialize BMI and Download firmware */
- pHifContext = cds_get_context(CDF_MODULE_ID_HIF);
+ pHifContext = cds_get_context(QDF_MODULE_ID_HIF);
if (!pHifContext) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
"%s: failed to get HIF context", __func__);
goto err_sched_close;
}
ol_ctx = cds_get_context(CDF_MODULE_ID_BMI);
if (bmi_download_firmware(ol_ctx)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
"%s: BMI failed to download target", __func__);
goto err_bmi_close;
}
@@ -262,19 +262,19 @@
htcInfo.pContext = ol_ctx;
htcInfo.TargetFailure = ol_target_failure;
htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge;
- cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
+ cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
/* Create HTC */
gp_cds_context->htc_ctx =
htc_create(pHifContext, &htcInfo, cdf_ctx);
if (!gp_cds_context->htc_ctx) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
"%s: Failed to Create HTC", __func__);
goto err_bmi_close;
}
if (bmi_done(ol_ctx)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
"%s: Failed to complete BMI phase", __func__);
goto err_htc_close;
}
@@ -287,7 +287,7 @@
hdd_ctx = (hdd_context_t *) (gp_cds_context->pHDDContext);
if ((NULL == hdd_ctx) || (NULL == hdd_ctx->config)) {
/* Critical Error ... Cannot proceed further */
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Hdd Context is Null", __func__);
CDF_ASSERT(0);
goto err_htc_close;
@@ -302,7 +302,7 @@
wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms);
if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
/* Critical Error ... Cannot proceed further */
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to open WMA module %d", __func__,
vStatus);
CDF_ASSERT(0);
@@ -311,14 +311,14 @@
#if defined(QCA_WIFI_FTM)
hdd_update_config(hdd_ctx);
- pHtcContext = cds_get_context(CDF_MODULE_ID_HTC);
+ pHtcContext = cds_get_context(QDF_MODULE_ID_HTC);
if (!pHtcContext) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
"%s: failed to get HTC context", __func__);
goto err_wma_close;
}
if (htc_wait_target(pHtcContext)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
"%s: Failed to complete BMI phase", __func__);
goto err_wma_close;
}
@@ -338,7 +338,7 @@
if (eSIR_SUCCESS != sirStatus) {
/* Critical Error ... Cannot proceed further */
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to open MAC %d", __func__, sirStatus);
CDF_ASSERT(0);
goto err_wma_close;
@@ -348,7 +348,7 @@
vStatus = sme_open(gp_cds_context->pMACContext);
if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
/* Critical Error ... Cannot proceed further */
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to open SME %d", __func__, vStatus);
goto err_mac_close;
}
@@ -356,10 +356,10 @@
vStatus = sme_init_chan_list(gp_cds_context->pMACContext,
hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src);
if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to init sme channel list", __func__);
} else {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
"%s: CDS successfully Opened", __func__);
return QDF_STATUS_SUCCESS;
}
@@ -417,7 +417,7 @@
#ifndef QCA_WIFI_FTM
qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to close SME %d", __func__, qdf_status);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
}
@@ -425,7 +425,7 @@
qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to close MAC %d", __func__, qdf_status);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
}
@@ -435,7 +435,7 @@
qdf_status = wma_close(cds_context);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to close WMA %d", __func__, qdf_status);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
}
@@ -447,7 +447,7 @@
}
qdf_status = wma_wmi_service_close(cds_context);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to close wma_wmi_service", __func__);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
}
@@ -459,7 +459,7 @@
qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to destroy ProbeEvent %d", __func__,
qdf_status);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
@@ -467,7 +467,7 @@
qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to destroy wmaCompleteEvent %d", __func__,
qdf_status);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
@@ -521,11 +521,11 @@
HDD_FTM_WMA_PRE_START_TIMEOUT);
if (qdf_status != QDF_STATUS_SUCCESS) {
if (qdf_status == QDF_STATUS_E_TIMEOUT) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Timeout occurred before WMA complete",
__func__);
} else {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: wma_pre_start reporting other error",
__func__);
}
@@ -676,7 +676,7 @@
qdf_status = cds_sched_close(cds_context);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to close CDS Scheduler", __func__);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
}
@@ -780,7 +780,7 @@
vStatus = wma_start(p_cds_context);
if (vStatus != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to start WMA", __func__);
goto err_status_failure;
}
diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c
index c41e8f4..57dc2c9 100644
--- a/core/hdd/src/wlan_hdd_green_ap.c
+++ b/core/hdd/src/wlan_hdd_green_ap.c
@@ -162,7 +162,7 @@
break;
case GREEN_AP_PS_STOP_EVENT:
- if (!(cds_get_concurrency_mode() & CDF_SAP_MASK))
+ if (!(cds_get_concurrency_mode() & QDF_SAP_MASK))
green_ap->ps_enable = 0;
break;
@@ -326,7 +326,7 @@
green_ap->ps_delay_time = GREEN_AP_PS_DELAY_TIME;
cdf_mc_timer_init(&green_ap->ps_timer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
hdd_wlan_green_ap_timer_fn, hdd_ctx);
error:
@@ -430,13 +430,13 @@
*/
}
- if (!(CDF_STA_MASK & hdd_ctx->concurrency_mode) &&
+ if (!(QDF_STA_MASK & hdd_ctx->concurrency_mode) &&
cfg->enable2x2 && cfg->enableGreenAP) {
hdd_wlan_green_ap_mc(hdd_ctx, GREEN_AP_PS_START_EVENT);
} else {
hdd_wlan_green_ap_mc(hdd_ctx, GREEN_AP_PS_STOP_EVENT);
hdd_notice("Green-AP: is disabled, due to sta_concurrency: %d, enable2x2: %d, enableGreenAP: %d",
- CDF_STA_MASK & hdd_ctx->concurrency_mode,
+ QDF_STA_MASK & hdd_ctx->concurrency_mode,
cfg->enable2x2, cfg->enableGreenAP);
}
exit:
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 85a6c92..05e9328 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -70,7 +70,7 @@
#include "wma_api.h"
#endif
#include "wlan_hdd_trace.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "cdf_trace.h"
#include "wlan_hdd_cfg.h"
#include "cds_concurrency.h"
@@ -219,7 +219,7 @@
ENTER();
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0));
if (cds_is_load_or_unload_in_progress()) {
@@ -589,7 +589,7 @@
hal_handle = WLAN_HDD_GET_HAL_CTX(sta_adapter);
if (true == cds_is_sta_connection_pending()) {
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_ISSUE_JOIN_REQ,
sta_adapter->sessionId, roam_id));
if (QDF_STATUS_SUCCESS !=
@@ -980,7 +980,7 @@
qdf_status =
cdf_mc_timer_init(&pHddApCtx->
hdd_ap_inactivity_timer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
hdd_hostapd_inactivity_timer_cb,
dev);
if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -1229,7 +1229,7 @@
msg.src_addr.sa_family = ARPHRD_ETHER;
memcpy(msg.src_addr.sa_data,
&pSapEvent->sapevt.sapStationMICFailureEvent.
- staMac, CDF_MAC_ADDR_SIZE);
+ staMac, QDF_MAC_ADDR_SIZE);
hddLog(LOG1, "MIC MAC " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(msg.src_addr.sa_data));
if (pSapEvent->sapevt.sapStationMICFailureEvent.
@@ -1265,7 +1265,7 @@
wrqu.addr.sa_family = ARPHRD_ETHER;
memcpy(wrqu.addr.sa_data,
&pSapEvent->sapevt.sapStationAssocReassocCompleteEvent.
- staMac, CDF_MAC_ADDR_SIZE);
+ staMac, QDF_MAC_ADDR_SIZE);
hddLog(LOG1, " associated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
we_event = IWEVREGISTERED;
@@ -1294,7 +1294,7 @@
pSapEvent->sapevt.
sapStationAssocReassocCompleteEvent.
staId, 0, 0,
- (struct cdf_mac_addr *)
+ (struct qdf_mac_addr *)
wrqu.addr.sa_data,
pSapEvent->sapevt.
sapStationAssocReassocCompleteEvent.
@@ -1312,7 +1312,7 @@
pSapEvent->sapevt.
sapStationAssocReassocCompleteEvent.
staId, 0, 0,
- (struct cdf_mac_addr *)
+ (struct qdf_mac_addr *)
wrqu.addr.sa_data,
pSapEvent->sapevt.
sapStationAssocReassocCompleteEvent.
@@ -1439,7 +1439,7 @@
case eSAP_STA_DISASSOC_EVENT:
memcpy(wrqu.addr.sa_data,
&pSapEvent->sapevt.sapStationDisassocCompleteEvent.
- staMac, CDF_MAC_ADDR_SIZE);
+ staMac, QDF_MAC_ADDR_SIZE);
hddLog(LOG1, " disassociated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
@@ -1900,9 +1900,9 @@
return -EINVAL;
}
/* Validity checks */
- if ((gen_ie_len < CDF_MIN(DOT11F_IE_RSN_MIN_LEN, DOT11F_IE_WPA_MIN_LEN))
+ if ((gen_ie_len < QDF_MIN(DOT11F_IE_RSN_MIN_LEN, DOT11F_IE_WPA_MIN_LEN))
|| (gen_ie_len >
- CDF_MAX(DOT11F_IE_RSN_MAX_LEN, DOT11F_IE_WPA_MAX_LEN)))
+ QDF_MAX(DOT11F_IE_RSN_MAX_LEN, DOT11F_IE_WPA_MAX_LEN)))
return -EINVAL;
/* Type check */
if (gen_ie[0] == DOT11F_EID_RSN) {
@@ -2244,7 +2244,7 @@
return ret;
}
-static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size)
+static void print_mac_list(struct qdf_mac_addr *macList, uint8_t size)
{
int i;
uint8_t *macArray;
@@ -2260,7 +2260,7 @@
static QDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter)
{
eSapMacAddrACL acl_mode;
- struct cdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS];
+ struct qdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS];
uint8_t listnum;
void *p_cds_gctx = NULL;
@@ -3232,7 +3232,7 @@
v_CONTEXT_t cds_ctx;
#endif
uint8_t *value = (uint8_t *) extra;
- uint8_t pPeerStaMac[CDF_MAC_ADDR_SIZE];
+ uint8_t pPeerStaMac[QDF_MAC_ADDR_SIZE];
int listType, cmd, i;
int ret;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
@@ -3248,13 +3248,13 @@
#ifndef WLAN_FEATURE_MBSSID
cds_ctx = hdd_ctx->pcds_context;
if (NULL == cds_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Vos Context is NULL", __func__);
return -EINVAL;
}
#endif
- for (i = 0; i < CDF_MAC_ADDR_SIZE; i++)
+ for (i = 0; i < QDF_MAC_ADDR_SIZE; i++)
pPeerStaMac[i] = *(value + i);
listType = (int)(*(value + i));
@@ -3346,8 +3346,8 @@
int *value = (int *)extra;
int set_value;
int ret;
- struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
- struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
ENTER();
@@ -3397,7 +3397,7 @@
hdd_context_t *hdd_ctx;
int *value = (int *)extra;
int set_value;
- struct cdf_mac_addr bssid;
+ struct qdf_mac_addr bssid;
int ret;
ENTER();
@@ -3494,13 +3494,13 @@
left = wrqu->data.length - maclist_index;
spin_lock_bh(&pHostapdAdapter->staInfo_lock);
- while ((cnt < WLAN_MAX_STA_COUNT) && (left >= CDF_MAC_ADDR_SIZE)) {
+ while ((cnt < WLAN_MAX_STA_COUNT) && (left >= QDF_MAC_ADDR_SIZE)) {
if ((pStaInfo[cnt].isUsed) &&
(!IS_BROADCAST_MAC(pStaInfo[cnt].macAddrSTA.bytes))) {
memcpy(&buf[maclist_index], &(pStaInfo[cnt].macAddrSTA),
- CDF_MAC_ADDR_SIZE);
- maclist_index += CDF_MAC_ADDR_SIZE;
- left -= CDF_MAC_ADDR_SIZE;
+ QDF_MAC_ADDR_SIZE);
+ maclist_index += QDF_MAC_ADDR_SIZE;
+ left -= QDF_MAC_ADDR_SIZE;
}
cnt++;
}
@@ -3557,7 +3557,7 @@
ENTER();
if (!capable(CAP_NET_ADMIN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("permission check failed"));
return -EPERM;
}
@@ -3780,7 +3780,7 @@
#ifndef WLAN_FEATURE_MBSSID
cds_ctx = hdd_ctx->pcds_context;
if (NULL == cds_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: vos context is not valid ", __func__);
return -EINVAL;
}
@@ -3799,7 +3799,7 @@
#endif
&length, genIeBytes);
if (status == QDF_STATUS_SUCCESS) {
- length = CDF_MIN(length, DOT11F_IE_RSN_MAX_LEN);
+ length = QDF_MIN(length, DOT11F_IE_RSN_MAX_LEN);
if (wrqu->data.length < length ||
copy_to_user(wrqu->data.pointer, (void *)genIeBytes, length)) {
hddLog(LOG1, FL("failed to copy data to user buffer"));
@@ -4009,7 +4009,7 @@
#ifndef WLAN_FEATURE_MBSSID
cds_ctx = hdd_ctx->pcds_context;
if (NULL == cds_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: pVosContext is NULL", __func__);
return -EINVAL;
}
@@ -4041,12 +4041,12 @@
setKey.keyDirection = eSIR_TX_RX;
cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
setKey.keyDirection = eSIR_TX_DEFAULT;
cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
/*For supplicant pae role is zero */
@@ -4455,7 +4455,7 @@
ENTER();
if (!capable(CAP_NET_ADMIN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("permission check failed"));
return -EPERM;
}
@@ -4468,7 +4468,7 @@
#ifndef WLAN_FEATURE_MBSSID
cds_ctx = hdd_ctx->pcds_context;
if (NULL == cds_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: HDD context is not valid ", __func__);
return -EINVAL;
}
@@ -5139,7 +5139,7 @@
ENTER();
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Adapter is NULL", __func__);
return -EINVAL;
}
@@ -5254,7 +5254,7 @@
#ifndef WLAN_FEATURE_MBSSID
cds_ctx = hdd_ctx->pcds_context;
if (NULL == cds_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: CDF Context is NULL", __func__);
return -EINVAL;
}
@@ -5329,7 +5329,7 @@
char *pLinkSpeed = (char *)extra;
uint32_t link_speed = 0;
int len = sizeof(uint32_t) + 1;
- struct cdf_mac_addr macAddress;
+ struct qdf_mac_addr macAddress;
char pmacAddress[MAC_ADDRESS_STR_LEN + 1];
QDF_STATUS status = QDF_STATUS_E_FAILURE;
int rc, valid, i;
@@ -5952,9 +5952,9 @@
iw_softap_set_two_ints_getnone,
};
const struct iw_handler_def hostapd_handler_def = {
- .num_standard = CDF_ARRAY_SIZE(hostapd_handler),
- .num_private = CDF_ARRAY_SIZE(hostapd_private),
- .num_private_args = CDF_ARRAY_SIZE(hostapd_private_args),
+ .num_standard = QDF_ARRAY_SIZE(hostapd_handler),
+ .num_private = QDF_ARRAY_SIZE(hostapd_private),
+ .num_private_args = QDF_ARRAY_SIZE(hostapd_private_args),
.standard = (iw_handler *) hostapd_handler,
.private = (iw_handler *) hostapd_private,
.private_args = hostapd_private_args,
@@ -6046,7 +6046,7 @@
qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
("ERROR: Hostapd HDD stop bss event init failed!!"));
#ifdef WLAN_FEATURE_MBSSID
wlansap_close(sapContext);
@@ -6352,7 +6352,7 @@
}
pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_CHANNEL,
pAdapter->sessionId, channel_type));
@@ -7485,7 +7485,7 @@
* */
status =
hdd_softap_unpack_ie(cds_get_context
- (CDF_MODULE_ID_SME),
+ (QDF_MODULE_ID_SME),
&RSNEncryptType, &mcRSNEncryptType,
&RSNAuthType, &MFPCapable,
&MFPRequired,
@@ -7533,7 +7533,7 @@
"RSNWPA IE MAX Length exceeded; length =%d",
pConfig->RSNWPAReqIELength);
status = hdd_softap_unpack_ie
- (cds_get_context(CDF_MODULE_ID_SME),
+ (cds_get_context(QDF_MODULE_ID_SME),
&RSNEncryptType,
&mcRSNEncryptType, &RSNAuthType,
&MFPCapable, &MFPRequired,
@@ -7591,7 +7591,7 @@
cdf_mem_copy(pConfig->self_macaddr.bytes,
pHostapdAdapter->macAddressCurrent.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
/* default value */
pConfig->SapMacaddr_acl = eSAP_ACCEPT_UNLESS_DENIED;
@@ -7872,12 +7872,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_STOP_AP,
pAdapter->sessionId, pAdapter->device_mode));
@@ -8100,12 +8100,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_START_AP, pAdapter->sessionId,
params->beacon_interval));
if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
@@ -8258,12 +8258,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CHANGE_BEACON,
pAdapter->sessionId, pAdapter->device_mode));
hddLog(LOG1, FL("Device_mode %s(%d)"),
diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h
index cf53354..0706e56 100644
--- a/core/hdd/src/wlan_hdd_hostapd.h
+++ b/core/hdd/src/wlan_hdd_hostapd.h
@@ -39,7 +39,7 @@
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <qdf_list.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
#include <wlan_hdd_main.h>
/* Preprocessor definitions and constants */
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 79e1068..eb8f5b2 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -558,7 +558,7 @@
* then no need to proceed with reassoc
*/
if (!memcmp(bssid, pHddStaCtx->conn_info.bssId.bytes,
- CDF_MAC_ADDR_SIZE)) {
+ QDF_MAC_ADDR_SIZE)) {
hddLog(LOG1,
FL("Reassoc BSSID is same as currently associated AP bssid"));
ret = -EINVAL;
@@ -581,7 +581,7 @@
handoffInfo.channel = channel;
handoffInfo.src = REASSOC;
- cdf_mem_copy(handoffInfo.bssid.bytes, bssid, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(handoffInfo.bssid.bytes, bssid, QDF_MAC_ADDR_SIZE);
sme_handoff_request(hdd_ctx->hHal, adapter->sessionId,
&handoffInfo);
}
@@ -746,7 +746,7 @@
* then no need to send action frame
*/
if (memcmp(bssid, pHddStaCtx->conn_info.bssId.bytes,
- CDF_MAC_ADDR_SIZE)) {
+ QDF_MAC_ADDR_SIZE)) {
hddLog(LOG1, FL("STA is not associated to this AP"));
ret = -EINVAL;
goto exit;
@@ -813,10 +813,10 @@
hdr = (struct ieee80211_hdr_3addr *)frame;
hdr->frame_control =
cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION);
- cdf_mem_copy(hdr->addr1, bssid, CDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(hdr->addr1, bssid, QDF_MAC_ADDR_SIZE);
cdf_mem_copy(hdr->addr2, adapter->macAddressCurrent.bytes,
- CDF_MAC_ADDR_SIZE);
- cdf_mem_copy(hdr->addr3, bssid, CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
+ cdf_mem_copy(hdr->addr3, bssid, QDF_MAC_ADDR_SIZE);
cdf_mem_copy(hdr + 1, payload, payload_len);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
@@ -1028,7 +1028,7 @@
*pNumChannels = tempInt;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Number of channels are: %d", *pNumChannels);
for (j = 0; j < (*pNumChannels); j++) {
@@ -1076,7 +1076,7 @@
}
pChannelList[j] = tempInt;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Channel %d added to preferred channel list",
pChannelList[j]);
}
@@ -1113,18 +1113,18 @@
ret = hdd_parse_channellist(command, channel_list, &num_chan);
if (ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to parse channel list information",
__func__);
goto exit;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL,
adapter->sessionId, num_chan));
if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: number of channels (%d) supported exceeded max (%d)",
__func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN);
ret = -EINVAL;
@@ -1136,7 +1136,7 @@
adapter->sessionId,
channel_list, num_chan);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to update channel list information",
__func__);
ret = -EINVAL;
@@ -1182,21 +1182,21 @@
num_chan = *value++;
if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: number of channels (%d) supported exceeded max (%d)",
__func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN);
ret = -EINVAL;
goto exit;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL,
adapter->sessionId, num_chan));
for (i = 0; i < num_chan; i++) {
channel = *value++;
if (channel > WNI_CFG_CURRENT_CHANNEL_STAMAX) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: index %d invalid channel %d", __func__,
i, channel);
ret = -EINVAL;
@@ -1209,7 +1209,7 @@
adapter->sessionId,
channel_list, num_chan);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to update channel list information",
__func__);
ret = -EINVAL;
@@ -1475,7 +1475,7 @@
hddLog(CDF_TRACE_LEVEL_DEBUG,
"desiredTxPwr %d", pPlmRequest->desiredTxPwr);
- for (count = 0; count < CDF_MAC_ADDR_SIZE; count++) {
+ for (count = 0; count < QDF_MAC_ADDR_SIZE; count++) {
cmdPtr = strpbrk(cmdPtr, " ");
if (NULL == cmdPtr)
@@ -1599,7 +1599,7 @@
rc = wait_for_completion_timeout(&hdd_ctx->ready_to_extwow,
msecs_to_jiffies(WLAN_WAIT_TIME_READY_TO_EXTWOW));
if (!rc) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to get ready to extwow", __func__);
return -EPERM;
}
@@ -1609,20 +1609,20 @@
pm_message_t state;
state.event = PM_EVENT_SUSPEND;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received ready to ExtWoW. Going to suspend",
__func__);
rc = wlan_hdd_cfg80211_suspend_wlan(hdd_ctx->wiphy, NULL);
if (rc < 0) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: wlan_hdd_cfg80211_suspend_wlan failed, error = %d",
__func__, rc);
return rc;
}
cdf_ret_status = wlan_hdd_bus_suspend(state);
if (cdf_ret_status != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: wlan_hdd_suspend failed, status = %d",
__func__, cdf_ret_status);
wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy);
@@ -1630,7 +1630,7 @@
}
}
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Received ready to ExtWoW failure", __func__);
return -EPERM;
}
@@ -1716,7 +1716,7 @@
}
if (2 != sscanf(arg, "%8s %16s", id, password)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Invalid Number of arguments"));
return -EINVAL;
}
@@ -1730,7 +1730,7 @@
params.pass_length = strlen(password);
cdf_mem_copy(params.password, password, params.pass_length);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: %d %pM %.8s %u %.16s %u",
__func__, params.vdev_id, params.wakee_mac_addr.bytes,
params.identification_id, params.id_length,
@@ -1764,7 +1764,7 @@
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter);
char mac_addr[20], rc4_key[20];
- unsigned int gateway_mac[CDF_MAC_ADDR_SIZE];
+ unsigned int gateway_mac[QDF_MAC_ADDR_SIZE];
tSirAppType2Params params;
int ret;
@@ -1792,7 +1792,7 @@
(unsigned int *)¶ms.tcp_rx_timeout_val);
if (ret != 15 && ret != 7) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Invalid Number of arguments");
return -EINVAL;
}
@@ -1801,20 +1801,20 @@
sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", &gateway_mac[0],
&gateway_mac[1], &gateway_mac[2], &gateway_mac[3],
&gateway_mac[4], &gateway_mac[5])) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Invalid MacAddress Input %s", mac_addr);
return -EINVAL;
}
if (params.tcp_src_port > WLAN_HDD_MAX_TCP_PORT ||
params.tcp_dst_port > WLAN_HDD_MAX_TCP_PORT) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Invalid TCP Port Number");
return -EINVAL;
}
cdf_mem_copy(¶ms.gateway_mac.bytes, (uint8_t *) &gateway_mac,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
params.rc4_key_len = strlen(rc4_key);
cdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len);
@@ -1848,7 +1848,7 @@
params.tcp_rx_timeout_val :
hdd_ctx->config->extWowApp2TcpRxTimeout;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: %pM %.16s %u %u %u %u %u %u %u %u %u %u %u %u %u",
__func__, gateway_mac, rc4_key, params.ip_id,
params.ip_device_ip, params.ip_server_ip, params.tcp_seq,
@@ -1911,7 +1911,7 @@
*pTxPower = tempInt;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"SETMAXTXPOWER: %d", *pTxPower);
return 0;
@@ -1923,7 +1923,7 @@
int ret = 0;
if (!pCfg || !command || !extra || !len) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: argument passed for GETDWELLTIME is incorrect",
__func__);
ret = -EINVAL;
@@ -2215,7 +2215,7 @@
pEseBcnReq->numBcnReqIe = tempInt;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Number of Bcn Req Ie fields(%d)", pEseBcnReq->numBcnReqIe);
for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) {
@@ -2252,7 +2252,7 @@
switch (i) {
case 0: /* Measurement token */
if (tempInt <= 0) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Invalid Measurement Token(%d)",
tempInt);
@@ -2266,7 +2266,7 @@
if ((tempInt <= 0) ||
(tempInt >
WNI_CFG_CURRENT_CHANNEL_STAMAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Invalid Channel Number(%d)",
tempInt);
@@ -2278,7 +2278,7 @@
case 2: /* Scan mode */
if ((tempInt < eSIR_PASSIVE_SCAN)
|| (tempInt > eSIR_BEACON_TABLE)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Invalid Scan Mode(%d) Expected{0|1|2}",
tempInt);
@@ -2294,7 +2294,7 @@
((tempInt < 0) &&
(pEseBcnReq->bcnReq[j].scanMode ==
eSIR_BEACON_TABLE))) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Invalid Measurement Duration(%d)",
tempInt);
@@ -2308,7 +2308,7 @@
}
for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"Index(%d) Measurement Token(%u) Channel(%u) Scan Mode(%u) Measurement Duration(%u)",
j,
pEseBcnReq->bcnReq[j].measurementToken,
@@ -2404,7 +2404,7 @@
struct hdd_config *pConfig = NULL;
if (pHddCtx == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: HDD context is null", __func__);
return -EINVAL;
}
@@ -2449,7 +2449,7 @@
{
int ret = 0;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL,
adapter->sessionId,
(unsigned)(*(hdd_ctx->p2pDeviceAddress.bytes + 2)
@@ -2612,7 +2612,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed Input value may be out of range[%d - %d]",
__func__,
@@ -2626,7 +2626,7 @@
if ((lookUpThreshold < CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN)
|| (lookUpThreshold > CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Neighbor lookup threshold value %d is out of range (Min: %d Max: %d)",
lookUpThreshold,
@@ -2636,10 +2636,10 @@
goto exit;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL,
adapter->sessionId, lookUpThreshold));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set Roam trigger (Neighbor lookup threshold) = %d",
__func__,
lookUpThreshold);
@@ -2649,7 +2649,7 @@
adapter->sessionId,
lookUpThreshold);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to set roam trigger, try again",
__func__);
@@ -2674,14 +2674,14 @@
char extra[32];
uint8_t len = 0;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL,
adapter->sessionId, lookUpThreshold));
len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -2715,7 +2715,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed Input value may be out of range[%d - %d]",
__func__,
@@ -2727,7 +2727,7 @@
if ((roamScanPeriod < (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000))
|| (roamScanPeriod > (CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX / 1000))) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Roam scan period value %d is out of range (Min: %d Max: %d)",
roamScanPeriod,
@@ -2736,12 +2736,12 @@
ret = -EINVAL;
goto exit;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL,
adapter->sessionId, roamScanPeriod));
neighborEmptyScanRefreshPeriod = roamScanPeriod * 1000;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set roam scan period (Empty Scan refresh period) = %d",
__func__,
roamScanPeriod);
@@ -2768,7 +2768,7 @@
char extra[32];
uint8_t len = 0;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL,
adapter->sessionId,
nEmptyScanRefreshPeriod));
@@ -2776,7 +2776,7 @@
"GETROAMSCANPERIOD",
(nEmptyScanRefreshPeriod / 1000));
/* Returned value is in units of seconds */
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
hddLog(LOGE,
FL("failed to copy data to user buffer"));
@@ -2809,7 +2809,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed Input value may be out of range[%d - %d]",
__func__,
@@ -2823,7 +2823,7 @@
(CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000))
|| (roamScanRefreshPeriod >
(CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX / 1000))) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Neighbor scan results refresh period value %d is out of range (Min: %d Max: %d)",
roamScanRefreshPeriod,
@@ -2836,7 +2836,7 @@
}
neighborScanRefreshPeriod = roamScanRefreshPeriod * 1000;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set roam scan refresh period (Scan refresh period) = %d",
__func__,
roamScanRefreshPeriod);
@@ -2867,9 +2867,9 @@
"GETROAMSCANREFRESHPERIOD",
(value / 1000));
/* Returned value is in units of seconds */
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -2899,7 +2899,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_LFR_FEATURE_ENABLED_MIN,
@@ -2909,7 +2909,7 @@
}
if ((roamMode < CFG_LFR_FEATURE_ENABLED_MIN) ||
(roamMode > CFG_LFR_FEATURE_ENABLED_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Roam Mode value %d is out of range (Min: %d Max: %d)",
roamMode,
@@ -2919,7 +2919,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
"%s: Received Command to Set Roam Mode = %d",
__func__, roamMode);
/*
@@ -2981,9 +2981,9 @@
roamMode = CFG_LFR_FEATURE_ENABLED_MIN;
len = scnprintf(extra, sizeof(extra), "%s %d", command, roamMode);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3013,7 +3013,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_ROAM_RSSI_DIFF_MIN,
@@ -3024,7 +3024,7 @@
if ((roamRssiDiff < CFG_ROAM_RSSI_DIFF_MIN) ||
(roamRssiDiff > CFG_ROAM_RSSI_DIFF_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Roam rssi diff value %d is out of range (Min: %d Max: %d)",
roamRssiDiff,
@@ -3034,7 +3034,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set roam rssi diff = %d",
__func__, roamRssiDiff);
@@ -3059,16 +3059,16 @@
char extra[32];
uint8_t len = 0;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_GETROAMDELTA_IOCTL,
adapter->sessionId, roamRssiDiff));
len = scnprintf(extra, sizeof(extra), "%s %d",
command, roamRssiDiff);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3091,15 +3091,15 @@
hdd_get_band_helper(hdd_ctx, &band);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_GETBAND_IOCTL,
adapter->sessionId, band));
len = scnprintf(extra, sizeof(extra), "%s %d", command, band);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3136,7 +3136,7 @@
ChannelList,
&numChannels,
adapter->sessionId)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_FATAL,
"%s: failed to get roam scan channel list",
__func__);
@@ -3144,7 +3144,7 @@
goto exit;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL,
adapter->sessionId, numChannels));
/*
@@ -3158,9 +3158,9 @@
len += scnprintf(extra + len, sizeof(extra) - len,
" %d", ChannelList[j]);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3190,7 +3190,7 @@
if (eseMode &&
hdd_is_okc_mode_enabled(hdd_ctx) &&
sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_WARN,
"%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
__func__);
@@ -3200,9 +3200,9 @@
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETCCXMODE", eseMode);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3232,7 +3232,7 @@
if (okcMode &&
sme_get_is_ese_feature_enabled(hdd_ctx->hHal) &&
sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_WARN,
"%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
__func__);
@@ -3242,10 +3242,10 @@
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETOKCMODE", okcMode);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3270,10 +3270,10 @@
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETFASTROAM", lfrMode);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3296,10 +3296,10 @@
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETFASTTRANSITION", ft);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3329,7 +3329,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__,
@@ -3341,7 +3341,7 @@
if ((minTime < CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN) ||
(minTime > CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"scan min channel time value %d is out of range (Min: %d Max: %d)",
minTime,
@@ -3351,10 +3351,10 @@
goto exit;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL,
adapter->sessionId, minTime));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change channel min time = %d",
__func__, minTime);
@@ -3391,14 +3391,14 @@
/* value is interms of msec */
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETROAMSCANCHANNELMINTIME", val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL,
adapter->sessionId, val));
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3428,7 +3428,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou16 failed range [%d - %d]",
__func__,
@@ -3440,7 +3440,7 @@
if ((maxTime < CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN) ||
(maxTime > CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"lfr mode value %d is out of range (Min: %d Max: %d)",
maxTime,
@@ -3450,7 +3450,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change channel max time = %d",
__func__, maxTime);
@@ -3478,10 +3478,10 @@
/* value is interms of msec */
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETSCANCHANNELTIME", val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3511,7 +3511,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou16 failed range [%d - %d]",
__func__,
@@ -3523,7 +3523,7 @@
if ((val < CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN) ||
(val > CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"scan home time value %d is out of range (Min: %d Max: %d)",
val,
@@ -3533,7 +3533,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change scan home time = %d",
__func__, val);
@@ -3561,10 +3561,10 @@
/* value is interms of msec */
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETSCANHOMETIME", val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3594,7 +3594,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_ROAM_INTRA_BAND_MIN,
@@ -3605,7 +3605,7 @@
if ((val < CFG_ROAM_INTRA_BAND_MIN) ||
(val > CFG_ROAM_INTRA_BAND_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"intra band mode value %d is out of range (Min: %d Max: %d)",
val,
@@ -3614,7 +3614,7 @@
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change intra band = %d",
__func__, val);
@@ -3639,9 +3639,9 @@
/* value is interms of msec */
len = scnprintf(extra, sizeof(extra), "%s %d",
"GETROAMINTRABAND", val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3671,7 +3671,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_ROAM_SCAN_N_PROBES_MIN,
@@ -3682,7 +3682,7 @@
if ((nProbes < CFG_ROAM_SCAN_N_PROBES_MIN) ||
(nProbes > CFG_ROAM_SCAN_N_PROBES_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"NProbes value %d is out of range (Min: %d Max: %d)",
nProbes,
@@ -3692,7 +3692,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set nProbes = %d",
__func__, nProbes);
@@ -3716,9 +3716,9 @@
uint8_t len = 0;
len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3750,7 +3750,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__,
@@ -3762,7 +3762,7 @@
if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) ||
(homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"homeAwayTime value %d is out of range (Min: %d Max: %d)",
homeAwayTime,
@@ -3772,7 +3772,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set scan away time = %d",
__func__, homeAwayTime);
@@ -3801,10 +3801,10 @@
uint8_t len = 0;
len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3843,7 +3843,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__,
@@ -3855,7 +3855,7 @@
if ((wesMode < CFG_ENABLE_WES_MODE_NAME_MIN) ||
(wesMode > CFG_ENABLE_WES_MODE_NAME_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"WES Mode value %d is out of range (Min: %d Max: %d)",
wesMode,
@@ -3865,7 +3865,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set WES Mode rssi diff = %d",
__func__, wesMode);
@@ -3888,9 +3888,9 @@
uint8_t len = 0;
len = scnprintf(extra, sizeof(extra), "%s %d", command, wesMode);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3921,14 +3921,14 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed.", __func__);
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set Opportunistic Threshold diff = %d",
__func__, nOpportunisticThresholdDiff);
@@ -3953,9 +3953,9 @@
uint8_t len = 0;
len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -3985,14 +3985,14 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed.", __func__);
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set Roam Rescan RSSI Diff = %d",
__func__, nRoamRescanRssiDiff);
@@ -4016,9 +4016,9 @@
uint8_t len = 0;
len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -4048,7 +4048,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_LFR_FEATURE_ENABLED_MIN,
@@ -4059,7 +4059,7 @@
if ((lfrMode < CFG_LFR_FEATURE_ENABLED_MIN) ||
(lfrMode > CFG_LFR_FEATURE_ENABLED_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"lfr mode value %d is out of range (Min: %d Max: %d)",
lfrMode,
@@ -4069,7 +4069,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change lfr mode = %d",
__func__, lfrMode);
@@ -4103,7 +4103,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__,
@@ -4115,7 +4115,7 @@
if ((ft < CFG_FAST_TRANSITION_ENABLED_NAME_MIN) ||
(ft > CFG_FAST_TRANSITION_ENABLED_NAME_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"ft mode value %d is out of range (Min: %d Max: %d)",
ft,
@@ -4125,7 +4125,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change ft mode = %d",
__func__, ft);
@@ -4160,10 +4160,10 @@
msg.type = SIR_HAL_ROAM_INVOKE;
msg.reserved = 0;
msg.bodyptr = fastreassoc;
- if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA,
+ if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
&msg)) {
cdf_mem_free(fastreassoc);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Not able to post ROAM_INVOKE_CMD message to WMA"));
}
}
@@ -4196,7 +4196,7 @@
/* if not associated, no need to proceed with reassoc */
if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s:Not associated!", __func__);
ret = -EINVAL;
@@ -4206,7 +4206,7 @@
ret = hdd_parse_reassoc_command_v1_data(value, targetApBssid,
&channel);
if (ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to parse reassoc command data",
__func__);
@@ -4219,7 +4219,7 @@
*/
if (true == cdf_mem_compare(targetApBssid,
pHddStaCtx->conn_info.bssId.bytes,
- CDF_MAC_ADDR_SIZE)) {
+ QDF_MAC_ADDR_SIZE)) {
/* Reassoc to same AP, only supported for Open Security*/
if ((pHddStaCtx->conn_info.ucEncryptionType ||
pHddStaCtx->conn_info.mcEncryptionType)) {
@@ -4321,7 +4321,7 @@
if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) &&
hdd_is_okc_mode_enabled(hdd_ctx) &&
sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_WARN,
"%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
__func__);
@@ -4339,7 +4339,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_ESE_FEATURE_ENABLED_MIN,
@@ -4350,7 +4350,7 @@
if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) ||
(eseMode > CFG_ESE_FEATURE_ENABLED_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Ese mode value %d is out of range (Min: %d Max: %d)",
eseMode,
@@ -4359,7 +4359,7 @@
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change ese mode = %d",
__func__, eseMode);
@@ -4393,14 +4393,14 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed ", __func__);
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set roam scan control = %d",
__func__, roamScanControl);
@@ -4434,7 +4434,7 @@
if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) &&
hdd_is_okc_mode_enabled(hdd_ctx) &&
sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_WARN,
"%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
__func__);
@@ -4452,7 +4452,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_OKC_FEATURE_ENABLED_MIN,
@@ -4463,7 +4463,7 @@
if ((okcMode < CFG_OKC_FEATURE_ENABLED_MIN) ||
(okcMode > CFG_OKC_FEATURE_ENABLED_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Okc mode value %d is out of range (Min: %d Max: %d)",
okcMode,
@@ -4472,7 +4472,7 @@
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to change okc mode = %d",
__func__, okcMode);
@@ -4495,9 +4495,9 @@
len = scnprintf(extra, sizeof(extra), "%s %d",
command, roamScanControl);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -4518,7 +4518,7 @@
bcMode = command + 11;
if ('1' == *bcMode) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_DEBUG,
FL("BTCOEXMODE %d"), *bcMode);
hdd_ctx->btCoexModeSet = true;
@@ -4528,7 +4528,7 @@
FL("Failed to abort existing scan status:%d"), ret);
}
} else if ('2' == *bcMode) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_DEBUG,
FL("BTCOEXMODE %d"), *bcMode);
hdd_ctx->btCoexModeSet = false;
@@ -4571,9 +4571,9 @@
memset(extra, 0, sizeof(extra));
ret = hdd_get_dwell_time(pCfg, command, extra, sizeof(extra), &len);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (ret != 0 || copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -4609,7 +4609,7 @@
pHddCtx = WLAN_HDD_GET_CTX(adapter);
if (0 != wlan_hdd_validate_context(pHddCtx)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s pHddCtx is not valid, Unable to set miracast mode",
__func__);
return -EINVAL;
@@ -4625,7 +4625,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range ",
__func__);
@@ -4635,7 +4635,7 @@
if ((filterType < WLAN_HDD_DRIVER_MIRACAST_CFG_MIN_VAL)
|| (filterType >
WLAN_HDD_DRIVER_MIRACAST_CFG_MAX_VAL)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Accepted Values are 0 to 2. 0-Disabled, 1-Source, 2-Sink ",
__func__);
@@ -4673,14 +4673,14 @@
ret = hdd_parse_channellist(value, ChannelList, &numChannels);
if (ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to parse channel list information",
__func__);
goto exit;
}
if (numChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: number of channels (%d) supported exceeded max (%d)",
__func__,
@@ -4694,7 +4694,7 @@
ChannelList,
numChannels);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to update channel list information",
__func__);
@@ -4732,7 +4732,7 @@
/* if not associated, return error */
if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s:Not associated!", __func__);
ret = -EINVAL;
@@ -4749,7 +4749,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, TID_MIN_VALUE,
@@ -4758,27 +4758,27 @@
goto exit;
}
if ((tid < TID_MIN_VALUE) || (tid > TID_MAX_VALUE)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"tid value %d is out of range (Min: %d Max: %d)",
tid, TID_MIN_VALUE, TID_MAX_VALUE);
ret = -EINVAL;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: Received Command to get tsm stats tid = %d",
__func__, tid);
if (QDF_STATUS_SUCCESS !=
hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to get tsm stats",
__func__);
ret = -EFAULT;
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"UplinkPktQueueDly(%d) UplinkPktQueueDlyHist[0](%d) UplinkPktQueueDlyHist[1](%d) UplinkPktQueueDlyHist[2](%d) UplinkPktQueueDlyHist[3](%d) UplinkPktTxDly(%u) UplinkPktLoss(%d) UplinkPktCount(%d) RoamingCount(%d) RoamingDly(%d)",
tsm_metrics.UplinkPktQueueDly,
@@ -4811,9 +4811,9 @@
tsm_metrics.UplinkPktCount,
tsm_metrics.RoamingCount,
tsm_metrics.RoamingDly);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -4838,7 +4838,7 @@
ret = hdd_parse_get_cckm_ie(value, &cckmIe, &cckmIeLen);
if (ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to parse cckm ie data",
__func__);
@@ -4846,7 +4846,7 @@
}
if (cckmIeLen > DOT11F_IE_RSN_MAX_LEN) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: CCKM Ie input length is more than max[%d]",
__func__, DOT11F_IE_RSN_MAX_LEN);
@@ -4889,7 +4889,7 @@
ret = hdd_parse_ese_beacon_req(value, &eseBcnReq);
if (ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to parse ese beacon req",
__func__);
@@ -4916,7 +4916,7 @@
ret = -EBUSY;
goto exit;
} else if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: sme_set_ese_beacon_request failed (%d)",
__func__, status);
@@ -4963,14 +4963,14 @@
QDF_STATUS qdf_status;
QDF_STATUS smeStatus;
uint8_t *value = command;
- struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
- struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
hdd_adapter_list_node_t *pAdapterNode = NULL;
hdd_adapter_list_node_t *pNext = NULL;
status = hdd_parse_setmaxtxpower_command(value, &txPower);
if (status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Invalid MAXTXPOWER command ");
ret = -EINVAL;
@@ -5034,7 +5034,7 @@
* If the input value is greater than max value of datatype,
* then also kstrtou8 fails
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: kstrtou8 failed range [%d - %d]",
__func__, CFG_ROAMING_DFS_CHANNEL_MIN,
@@ -5045,7 +5045,7 @@
if ((dfsScanMode < CFG_ROAMING_DFS_CHANNEL_MIN) ||
(dfsScanMode > CFG_ROAMING_DFS_CHANNEL_MAX)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"dfsScanMode value %d is out of range (Min: %d Max: %d)",
dfsScanMode,
@@ -5055,7 +5055,7 @@
goto exit;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Command to Set DFS Scan Mode = %d",
__func__, dfsScanMode);
@@ -5091,9 +5091,9 @@
uint8_t len = 0;
len = scnprintf(extra, sizeof(extra), "%s %d", command, dfsScanMode);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -5115,9 +5115,9 @@
uint8_t len;
len = scnprintf(extra, sizeof(extra), "%s %d", command, value);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer",
__func__);
@@ -5355,7 +5355,7 @@
wlan_hdd_get_rssi(adapter, &rssi);
len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
hddLog(LOGE, FL("Failed to copy data to user buffer"));
@@ -5381,7 +5381,7 @@
return ret;
len = scnprintf(extra, sizeof(extra), "%s %d", command, link_speed);
- len = CDF_MIN(priv_data->total_len, len + 1);
+ len = QDF_MIN(priv_data->total_len, len + 1);
if (copy_to_user(priv_data->buf, &extra, len)) {
hddLog(LOGE, FL("Failed to copy data to user buffer"));
ret = -EFAULT;
@@ -5598,12 +5598,12 @@
if (0 != rc) {
const char *msg = "unknown or badly formatted cmd\n%s";
- l = CDF_MIN(MAX_USER_COMMAND_SIZE,
+ l = QDF_MIN(MAX_USER_COMMAND_SIZE,
strlen(msg)+strlen(synopsis));
n = scnprintf(reply, l, msg, synopsis);
if (copy_to_user(priv_data->buf, reply,
- CDF_MIN(priv_data->total_len, l)))
+ QDF_MIN(priv_data->total_len, l)))
hdd_err("failed to copy data to user buffer");
hdd_debug("reply: %s", reply);
@@ -5641,7 +5641,7 @@
status_end:
hdd_info("wlan: STATUS DATA:\n%s", reply);
if (copy_to_user(priv_data->buf, reply,
- CDF_MIN(n, priv_data->total_len)))
+ QDF_MIN(n, priv_data->total_len)))
rc = -EINVAL;
} else if (!strcmp(subcmd, "STATS")) {
int n = 0;
@@ -5655,7 +5655,7 @@
}
if (n > 0) {
if (copy_to_user(priv_data->buf, reply,
- CDF_MIN(priv_data->total_len,
+ QDF_MIN(priv_data->total_len,
n)))
rc = -EINVAL;
hdd_info("wlan: STATS_DATA\n%s\n", reply);
@@ -5882,7 +5882,7 @@
uint8_t command_len,
hdd_priv_data_t *priv_data)
{
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_UNSUPPORTED_IOCTL,
adapter->sessionId, 0));
@@ -6235,7 +6235,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -6360,20 +6360,20 @@
ENTER();
if (dev != adapter->dev) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s: HDD adapter/dev inconsistency", __func__);
ret = -ENODEV;
goto exit;
}
if ((!ifr) || (!ifr->ifr_data)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: invalid data", __func__);
ret = -EINVAL;
goto exit;
}
#if defined(QCA_WIFI_FTM) && defined(LINUX_QCMBR)
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
if (SIOCIOCTLTX99 == cmd) {
ret = wlan_hdd_qcmbr_unified_ioctl(adapter, ifr);
goto exit;
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c
index 6199d4d..6354338 100644
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -322,7 +322,7 @@
hdd_adapter_t *adapter;
enum ipa_wlan_event type;
uint8_t sta_id;
- uint8_t mac_addr[CDF_MAC_ADDR_SIZE];
+ uint8_t mac_addr[QDF_MAC_ADDR_SIZE];
};
/**
@@ -359,7 +359,7 @@
* @rx_destructor_call: IPA Rx packet destructor count
*/
struct uc_rt_debug_info {
- v_TIME_t time;
+ unsigned long time;
uint64_t ipa_excep_count;
uint64_t rx_drop_count;
uint64_t net_sent_count;
@@ -443,30 +443,30 @@
cdf_mutex_t ipa_lock;
/* CE resources */
- cdf_dma_addr_t ce_sr_base_paddr;
+ qdf_dma_addr_t ce_sr_base_paddr;
uint32_t ce_sr_ring_size;
- cdf_dma_addr_t ce_reg_paddr;
+ qdf_dma_addr_t ce_reg_paddr;
/* WLAN TX:IPA->WLAN */
- cdf_dma_addr_t tx_comp_ring_base_paddr;
+ qdf_dma_addr_t tx_comp_ring_base_paddr;
uint32_t tx_comp_ring_size;
uint32_t tx_num_alloc_buffer;
/* WLAN RX:WLAN->IPA */
- cdf_dma_addr_t rx_rdy_ring_base_paddr;
+ qdf_dma_addr_t rx_rdy_ring_base_paddr;
uint32_t rx_rdy_ring_size;
- cdf_dma_addr_t rx_proc_done_idx_paddr;
+ qdf_dma_addr_t rx_proc_done_idx_paddr;
void *rx_proc_done_idx_vaddr;
/* WLAN RX2:WLAN->IPA */
- cdf_dma_addr_t rx2_rdy_ring_base_paddr;
+ qdf_dma_addr_t rx2_rdy_ring_base_paddr;
uint32_t rx2_rdy_ring_size;
- cdf_dma_addr_t rx2_proc_done_idx_paddr;
+ qdf_dma_addr_t rx2_proc_done_idx_paddr;
void *rx2_proc_done_idx_vaddr;
/* IPA UC doorbell registers paddr */
- cdf_dma_addr_t tx_comp_doorbell_paddr;
- cdf_dma_addr_t rx_ready_doorbell_paddr;
+ qdf_dma_addr_t tx_comp_doorbell_paddr;
+ qdf_dma_addr_t rx_ready_doorbell_paddr;
};
/**
@@ -507,13 +507,13 @@
(((struct hdd_ipa_cld_hdr *) (_data))->iface_id)
#define HDD_IPA_LOG(LVL, fmt, args ...) \
- CDF_TRACE(CDF_MODULE_ID_HDD, LVL, \
+ CDF_TRACE(QDF_MODULE_ID_HDD, LVL, \
"%s:%d: "fmt, __func__, __LINE__, ## args)
#define HDD_IPA_DBG_DUMP(_lvl, _prefix, _buf, _len) \
do { \
- CDF_TRACE(CDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \
- CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, _lvl, _buf, _len); \
+ CDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \
+ CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \
} while (0)
#define HDD_IPA_IS_CONFIG_ENABLED(_hdd_ctx, _mask) \
@@ -902,7 +902,7 @@
struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa;
cdf_mutex_init(&hdd_ipa->rt_debug_lock);
- cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, CDF_TIMER_TYPE_SW,
+ cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW,
hdd_ipa_uc_rt_debug_host_fill, (void *)hdd_ctx);
hdd_ipa->rt_buf_fill_index = 0;
cdf_mem_zero(hdd_ipa->rt_bug_buffer,
@@ -923,7 +923,7 @@
"%s: IPA RT debug is not enabled", __func__);
return;
}
- cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, CDF_TIMER_TYPE_SW,
+ cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, QDF_TIMER_TYPE_SW,
hdd_ipa_uc_rt_debug_handler, (void *)hdd_ctx);
cdf_mc_timer_start(&hdd_ipa->rt_debug_timer,
HDD_IPA_UC_RT_DEBUG_PERIOD);
@@ -1422,7 +1422,7 @@
(HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) {
/* STATs from host */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC WLAN_HOST CE ====\n"
"CE RING BASE: 0x%llx\n"
"CE RING SIZE: %d\n"
@@ -1430,7 +1430,7 @@
(unsigned long long)hdd_ipa->ce_sr_base_paddr,
hdd_ipa->ce_sr_ring_size,
(unsigned long long)hdd_ipa->ce_reg_paddr);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC WLAN_HOST TX ====\n"
"COMP RING BASE: 0x%llx\n"
"COMP RING SIZE: %d\n"
@@ -1440,7 +1440,7 @@
hdd_ipa->tx_comp_ring_size,
hdd_ipa->tx_num_alloc_buffer,
(unsigned long long)hdd_ipa->tx_comp_doorbell_paddr);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC WLAN_HOST RX ====\n"
"IND RING BASE: 0x%llx\n"
"IND RING SIZE: %d\n"
@@ -1456,7 +1456,7 @@
hdd_ipa->stats.num_rx_excep,
hdd_ipa->stats.num_tx_bcmc,
(unsigned long long)hdd_ipa->stats.num_tx_bcmc_err);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC WLAN_HOST CONTROL ====\n"
"SAP NUM STAs: %d\n"
"STA CONNECTED: %d\n"
@@ -1476,7 +1476,7 @@
/* STATs from FW */
uc_fw_stat = (struct ipa_uc_fw_stats *)
((uint8_t *)op_msg + sizeof(struct op_msg_type));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC WLAN_FW TX ====\n"
"COMP RING BASE: 0x%x\n"
"COMP RING SIZE: %d\n"
@@ -1497,7 +1497,7 @@
uc_fw_stat->tx_pkts_enqueued,
uc_fw_stat->tx_pkts_completed,
uc_fw_stat->tx_is_suspend, uc_fw_stat->tx_reserved);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC WLAN_FW RX ====\n"
"IND RING BASE: 0x%x\n"
"IND RING SIZE: %d\n"
@@ -1528,7 +1528,7 @@
uc_fw_stat->rx_is_suspend, uc_fw_stat->rx_reserved);
/* STATs from IPA */
ipa_get_wdi_stats(&ipa_stat);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC IPA TX ====\n"
"NUM PROCD : %d\n"
"CE DBELL : 0x%x\n"
@@ -1564,7 +1564,7 @@
num_bam_int_in_non_runnning_state,
ipa_stat.tx_ch_stats.num_qmb_int_handled);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"==== IPA_UC IPA RX ====\n"
"MAX OST PKT : %d\n"
"NUM PKT PRCSD : %d\n"
@@ -1813,7 +1813,7 @@
pipe_in.u.dl.comp_ring_base_pa = ipa_ctxt->tx_comp_ring_base_paddr;
pipe_in.u.dl.comp_ring_size =
- ipa_ctxt->tx_comp_ring_size * sizeof(cdf_dma_addr_t);
+ ipa_ctxt->tx_comp_ring_size * sizeof(qdf_dma_addr_t);
pipe_in.u.dl.ce_ring_base_pa = ipa_ctxt->ce_sr_base_paddr;
pipe_in.u.dl.ce_door_bell_pa = ipa_ctxt->ce_reg_paddr;
pipe_in.u.dl.ce_ring_size = ipa_ctxt->ce_sr_ring_size;
@@ -3675,7 +3675,7 @@
pending_event->type = type;
cdf_mem_copy(pending_event->mac_addr,
mac_addr,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
qdf_list_insert_back(&hdd_ipa->pending_event,
&pending_event->node);
@@ -4023,7 +4023,7 @@
ghdd_ipa = hdd_ipa;
hdd_ipa->hdd_ctx = hdd_ctx;
hdd_ipa->num_iface = 0;
- ol_txrx_ipa_uc_get_resource(cds_get_context(CDF_MODULE_ID_TXRX),
+ ol_txrx_ipa_uc_get_resource(cds_get_context(QDF_MODULE_ID_TXRX),
&hdd_ipa->ce_sr_base_paddr,
&hdd_ipa->ce_sr_ring_size,
&hdd_ipa->ce_reg_paddr,
diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c
index 1a51a05..1ea7dd4 100644
--- a/core/hdd/src/wlan_hdd_lro.c
+++ b/core/hdd/src/wlan_hdd_lro.c
@@ -34,7 +34,7 @@
#define HDD_DISALLOW_LEGACY_HDDLOG 1
#include <wlan_hdd_includes.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
#include <wlan_hdd_lro.h>
#include <wlan_hdd_napi.h>
#include <wma_api.h>
@@ -503,7 +503,7 @@
hdd_adapter_t *adapter)
{
struct hdd_lro_s *hdd_lro;
- struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+ struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
size_t lro_mgr_sz, desc_arr_sz, desc_pool_sz, hash_table_sz;
uint8_t *lro_mem_ptr;
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index ba20df8..3dc8735 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -55,7 +55,7 @@
#include "wlan_hdd_ftm.h"
#include "wlan_hdd_power.h"
#include "wlan_hdd_stats.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "cdf_trace.h"
#include <net/addrconf.h>
@@ -189,7 +189,7 @@
void wlan_hdd_txrx_pause_cb(uint8_t vdev_id,
enum netif_action_type action, enum netif_reason_type reason)
{
- hdd_context_t *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
hdd_adapter_t *adapter;
if (!hdd_ctx) {
@@ -482,7 +482,7 @@
*
* Return: None
*/
-static void hdd_cdf_trace_enable(CDF_MODULE_ID moduleId, uint32_t bitmask)
+static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask)
{
CDF_TRACE_LEVEL level;
@@ -744,16 +744,16 @@
* Return: None
*/
void hdd_update_macaddr(struct hdd_config *config,
- struct cdf_mac_addr hw_macaddr)
+ struct qdf_mac_addr hw_macaddr)
{
int8_t i;
uint8_t macaddr_b3, tmp_br3;
cdf_mem_copy(config->intfMacAddr[0].bytes, hw_macaddr.bytes,
- CDF_MAC_ADDR_SIZE);
- for (i = 1; i < CDF_MAX_CONCURRENCY_PERSONA; i++) {
+ QDF_MAC_ADDR_SIZE);
+ for (i = 1; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
cdf_mem_copy(config->intfMacAddr[i].bytes, hw_macaddr.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
macaddr_b3 = config->intfMacAddr[i].bytes[3];
tmp_br3 = ((macaddr_b3 >> 4 & INTF_MACADDR_MASK) + i) &
INTF_MACADDR_MASK;
@@ -1441,7 +1441,7 @@
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
int ret;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
adapter->sessionId, adapter->device_mode));
ret = wlan_hdd_validate_context(hdd_ctx);
@@ -1497,7 +1497,7 @@
ENTER();
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST,
adapter->sessionId, adapter->device_mode));
ret = wlan_hdd_validate_context(hdd_ctx);
@@ -1678,12 +1678,12 @@
uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *hdd_ctx)
{
int i;
- for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) {
+ for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
if (0 == ((hdd_ctx->config->intfAddrMask) & (1 << i)))
break;
}
- if (CDF_MAX_CONCURRENCY_PERSONA == i)
+ if (QDF_MAX_CONCURRENCY_PERSONA == i)
return NULL;
hdd_ctx->config->intfAddrMask |= (1 << i);
@@ -1693,7 +1693,7 @@
void wlan_hdd_release_intf_addr(hdd_context_t *hdd_ctx, uint8_t *releaseAddr)
{
int i;
- for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) {
+ for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
if (!memcmp(releaseAddr,
&hdd_ctx->config->intfMacAddr[i].bytes[0],
6)) {
@@ -1724,7 +1724,7 @@
static const uint8_t ipv6_router_solicitation[]
= {0x33, 0x33, 0x00, 0x00, 0x00, 0x02};
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam())
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam())
return;
ENTER();
@@ -2522,7 +2522,7 @@
cds_check_and_restart_sap_with_non_dfs_acs();
}
- if ((cds_get_conparam() != CDF_GLOBAL_FTM_MODE)
+ if ((cds_get_conparam() != QDF_GLOBAL_FTM_MODE)
&& (!hdd_ctx->config->enable2x2)) {
#define HDD_DTIM_1CHAIN_RX_ID 0x5
#define HDD_SMPS_PARAM_VALUE_S 29
@@ -2568,7 +2568,7 @@
#undef HDD_SMPS_PARAM_VALUE_S
}
- if (CDF_GLOBAL_FTM_MODE != cds_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) {
ret = wma_cli_set_command(adapter->sessionId,
WMI_PDEV_PARAM_HYST_EN,
hdd_ctx->config->enableMemDeepSleep,
@@ -2585,7 +2585,7 @@
#ifdef CONFIG_FW_LOGS_BASED_ON_INI
/* Enable FW logs based on INI configuration */
- if ((CDF_GLOBAL_FTM_MODE != cds_get_conparam()) &&
+ if ((QDF_GLOBAL_FTM_MODE != cds_get_conparam()) &&
(hdd_ctx->config->enable_fw_log)) {
uint8_t count = 0;
uint32_t value = 0;
@@ -2736,7 +2736,7 @@
void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
{
- struct cdf_mac_addr *bssid = NULL;
+ struct qdf_mac_addr *bssid = NULL;
tSirUpdateIE updateIE;
switch (pHostapdAdapter->device_mode) {
case WLAN_HDD_INFRA_STATION:
@@ -3051,7 +3051,7 @@
QDF_STATUS status;
hdd_adapter_t *adapter;
#ifndef MSM_PLATFORM
- struct cdf_mac_addr bcastMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr bcastMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
#endif
eConnectionState connState;
@@ -3642,7 +3642,7 @@
*/
static void hdd_free_context(hdd_context_t *hdd_ctx)
{
- if (CDF_GLOBAL_FTM_MODE != hdd_get_conparam())
+ if (QDF_GLOBAL_FTM_MODE != hdd_get_conparam())
hdd_logging_sock_deactivate_svc(hdd_ctx);
cdf_mem_free(hdd_ctx->config);
@@ -3674,7 +3674,7 @@
hdd_unregister_wext_all_adapters(hdd_ctx);
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_disable_ftm(hdd_ctx);
hdd_alert("FTM driver unloaded");
@@ -3823,7 +3823,7 @@
ENTER();
- hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context"));
EXIT();
@@ -3874,7 +3874,7 @@
* Return: 0 if successful, error number otherwise
*/
int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId,
- struct cdf_mac_addr macAddrSTA, int channel_type)
+ struct qdf_mac_addr macAddrSTA, int channel_type)
{
int status;
QDF_STATUS qdf_status;
@@ -3915,7 +3915,7 @@
QDF_STATUS qdf_status;
hdd_context_t *hdd_ctx;
- hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
status = wlan_hdd_validate_context(hdd_ctx);
if (0 != status) {
hddLog(LOGE, FL("HDD context is not valid"));
@@ -4614,7 +4614,7 @@
}
safe_channel_count = 0;
- unsafe_channel_count = CDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count,
+ unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count,
(uint16_t)NUM_20MHZ_RF_CHANNELS);
for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) {
@@ -4679,7 +4679,7 @@
}
/* Get the HDD context.*/
hdd_ctx =
- (hdd_context_t *)cds_get_context(CDF_MODULE_ID_HDD);
+ (hdd_context_t *)cds_get_context(QDF_MODULE_ID_HDD);
if (0 != wlan_hdd_validate_context(hdd_ctx))
return;
@@ -4929,7 +4929,7 @@
hddLog(CDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"),
hdd_ctx->unsafe_channel_count);
- unsafe_channel_count = CDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count,
+ unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count,
(uint16_t)NUM_20MHZ_RF_CHANNELS);
for (index = 0; index < unsafe_channel_count; index++) {
@@ -5016,41 +5016,41 @@
*/
static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx)
{
- hdd_cdf_trace_enable(CDF_MODULE_ID_WMI,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_WMI,
hdd_ctx->config->cdf_trace_enable_wdi);
- hdd_cdf_trace_enable(CDF_MODULE_ID_HDD,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_HDD,
hdd_ctx->config->cdf_trace_enable_hdd);
- hdd_cdf_trace_enable(CDF_MODULE_ID_SME,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_SME,
hdd_ctx->config->cdf_trace_enable_sme);
- hdd_cdf_trace_enable(CDF_MODULE_ID_PE,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_PE,
hdd_ctx->config->cdf_trace_enable_pe);
- hdd_cdf_trace_enable(CDF_MODULE_ID_WMA,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_WMA,
hdd_ctx->config->cdf_trace_enable_wma);
- hdd_cdf_trace_enable(CDF_MODULE_ID_SYS,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_SYS,
hdd_ctx->config->cdf_trace_enable_sys);
- hdd_cdf_trace_enable(CDF_MODULE_ID_CDF,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_QDF,
hdd_ctx->config->cdf_trace_enable_cdf);
- hdd_cdf_trace_enable(CDF_MODULE_ID_SAP,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_SAP,
hdd_ctx->config->cdf_trace_enable_sap);
- hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_SOFTAP,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP,
hdd_ctx->config->cdf_trace_enable_hdd_sap);
- hdd_cdf_trace_enable(CDF_MODULE_ID_BMI,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_BMI,
hdd_ctx->config->cdf_trace_enable_bmi);
- hdd_cdf_trace_enable(CDF_MODULE_ID_CFG,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_CFG,
hdd_ctx->config->cdf_trace_enable_cfg);
- hdd_cdf_trace_enable(CDF_MODULE_ID_EPPING,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_EPPING,
hdd_ctx->config->cdf_trace_enable_epping);
- hdd_cdf_trace_enable(CDF_MODULE_ID_CDF_DEVICE,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE,
hdd_ctx->config->cdf_trace_enable_cdf_devices);
- hdd_cdf_trace_enable(CDF_MODULE_ID_TXRX,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_TXRX,
hdd_ctx->config->cfd_trace_enable_txrx);
- hdd_cdf_trace_enable(CDF_MODULE_ID_HTC,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_HTC,
hdd_ctx->config->cdf_trace_enable_htc);
- hdd_cdf_trace_enable(CDF_MODULE_ID_HIF,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_HIF,
hdd_ctx->config->cdf_trace_enable_hif);
- hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_SAP_DATA,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA,
hdd_ctx->config->cdf_trace_enable_hdd_sap_data);
- hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_DATA,
+ hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_DATA,
hdd_ctx->config->cdf_trace_enable_hdd_data);
hdd_cfg_print(hdd_ctx);
@@ -5158,7 +5158,7 @@
/* Uses to enabled logging after SSR */
hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enable_fw_log;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam())
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam())
goto skip_multicast_logging;
cds_set_multicast_logging(hdd_ctx->config->multicast_host_fw_msgs);
@@ -5226,7 +5226,7 @@
}
cdf_mem_copy(&hdd_ctx->p2pDeviceAddress.bytes[0], p2p_dev_addr,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_P2P_DEVICE, "p2p%d",
@@ -5459,7 +5459,7 @@
if (IS_ERR(hdd_ctx))
return PTR_ERR(hdd_ctx);
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
ret = hdd_enable_ftm(hdd_ctx);
if (ret)
@@ -5478,7 +5478,7 @@
wlan_hdd_update_wiphy(hdd_ctx->wiphy, hdd_ctx->config);
- hdd_ctx->hHal = cds_get_context(CDF_MODULE_ID_SME);
+ hdd_ctx->hHal = cds_get_context(QDF_MODULE_ID_SME);
if (NULL == hdd_ctx->hHal) {
hddLog(CDF_TRACE_LEVEL_FATAL, FL("HAL context is null"));
@@ -5694,7 +5694,7 @@
#ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
status = cdf_mc_timer_init(&hdd_ctx->skip_acs_scan_timer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
hdd_skip_acs_scan_timer_handler,
(void *)hdd_ctx);
if (!QDF_IS_STATUS_SUCCESS(status))
@@ -5727,7 +5727,7 @@
#ifdef MSM_PLATFORM
spin_lock_init(&hdd_ctx->bus_bw_lock);
cdf_mc_timer_init(&hdd_ctx->bus_bw_timer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
hdd_bus_bw_compute_cbk, (void *)hdd_ctx);
#endif
@@ -5992,10 +5992,10 @@
pHddStaCtx->conn_info.SSID.SSID.ssId,
pHddStaCtx->conn_info.SSID.SSID.length);
}
- if (CDF_MAC_ADDR_SIZE >=
+ if (QDF_MAC_ADDR_SIZE >=
sizeof(pHddStaCtx->conn_info.bssId))
memcpy(data->bssid, pHddStaCtx->conn_info.bssId.bytes,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
return 0;
}
@@ -6203,7 +6203,7 @@
int ret = 0;
struct wlan_status_data data;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam())
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam())
return;
memset(&data, 0, sizeof(struct wlan_status_data));
@@ -6235,7 +6235,7 @@
return;
#endif
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam())
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam())
return;
memset(&data, 0, sizeof(struct wlan_version_data));
@@ -6960,11 +6960,11 @@
*
* This is the driver exit point (invoked when module is unloaded using rmmod)
*
- * Return: enum tCDF_GLOBAL_CON_MODE
+ * Return: enum tQDF_GLOBAL_CON_MODE
*/
-enum tCDF_GLOBAL_CON_MODE hdd_get_conparam(void)
+enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void)
{
- return (enum tCDF_GLOBAL_CON_MODE) curr_con_mode;
+ return (enum tQDF_GLOBAL_CON_MODE) curr_con_mode;
}
void hdd_set_conparam(uint32_t con_param)
diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c
index 80951cc..841efc2 100644
--- a/core/hdd/src/wlan_hdd_memdump.c
+++ b/core/hdd/src/wlan_hdd_memdump.c
@@ -67,9 +67,9 @@
{
int status;
hdd_context_t *hdd_ctx = data;
- cdf_dma_addr_t paddr;
- cdf_dma_addr_t dma_ctx = 0;
- cdf_device_t cdf_ctx;
+ qdf_dma_addr_t paddr;
+ qdf_dma_addr_t dma_ctx = 0;
+ qdf_device_t cdf_ctx;
status = wlan_hdd_validate_context(hdd_ctx);
if (0 != status) {
@@ -82,7 +82,7 @@
return;
}
- cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
+ cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
if (!cdf_ctx) {
hddLog(LOGE, FL("CDF context is NULL"));
return;
@@ -202,9 +202,9 @@
struct fw_dump_req fw_mem_dump_req;
struct fw_dump_seg_req *seg_req;
uint8_t loop;
- cdf_dma_addr_t paddr;
- cdf_dma_addr_t dma_ctx = 0;
- cdf_device_t cdf_ctx;
+ qdf_dma_addr_t paddr;
+ qdf_dma_addr_t dma_ctx = 0;
+ qdf_device_t cdf_ctx;
unsigned long rc;
struct hdd_fw_dump_context *context;
@@ -214,7 +214,7 @@
return status;
}
- cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
+ cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
if (!cdf_ctx) {
hddLog(LOGE, FL("CDF context is NULL"));
return -EINVAL;
@@ -393,9 +393,9 @@
{
int status;
hdd_context_t *hdd_ctx;
- cdf_dma_addr_t paddr;
- cdf_dma_addr_t dma_ctx = 0;
- cdf_device_t cdf_ctx;
+ qdf_dma_addr_t paddr;
+ qdf_dma_addr_t dma_ctx = 0;
+ qdf_device_t cdf_ctx;
hdd_ctx = memdump_get_file_data(file);
@@ -405,7 +405,7 @@
hddLog(LOGE, FL("HDD context is not valid"));
return -EINVAL;
}
- cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
+ cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
if (!cdf_ctx) {
hddLog(LOGE, FL("CDF context is NULL"));
return -EINVAL;
@@ -481,7 +481,7 @@
{
hdd_context_t *hdd_ctx;
- hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hddLog(LOGE , FL("Invalid HDD context"));
return -EINVAL;
@@ -542,13 +542,13 @@
QDF_STATUS cb_status;
QDF_STATUS qdf_status;
- hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hddLog(LOGE , FL("Invalid HDD context"));
return -EINVAL;
}
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Not initializing memdump in FTM mode"));
return -EINVAL;
}
@@ -569,7 +569,7 @@
init_completion(&fw_dump_context.response_event);
qdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer,
- CDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb,
+ QDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb,
(void *)hdd_ctx);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
hddLog(LOGE, FL("Failed to init memdump cleanup timer"));
@@ -591,23 +591,23 @@
void memdump_deinit(void)
{
hdd_context_t *hdd_ctx;
- cdf_dma_addr_t paddr;
- cdf_dma_addr_t dma_ctx = 0;
- cdf_device_t cdf_ctx;
+ qdf_dma_addr_t paddr;
+ qdf_dma_addr_t dma_ctx = 0;
+ qdf_device_t cdf_ctx;
QDF_STATUS qdf_status;
- hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD);
+ hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
if (!hdd_ctx) {
hddLog(LOGE , FL("Invalid HDD context"));
return;
}
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Not deinitializing memdump in FTM mode"));
return;
}
- cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE);
+ cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
if (!cdf_ctx) {
hddLog(LOGE, FL("CDF context is NULL"));
return;
diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c
index 9fe3aee..d95413d 100644
--- a/core/hdd/src/wlan_hdd_nan.c
+++ b/core/hdd/src/wlan_hdd_nan.c
@@ -68,7 +68,7 @@
if (ret_val)
return ret_val;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c
index 15d372d..29c8579 100644
--- a/core/hdd/src/wlan_hdd_napi.c
+++ b/core/hdd/src/wlan_hdd_napi.c
@@ -36,7 +36,7 @@
#include "cds_api.h" /* cds_get_context */
#include "hif.h" /* hif_map_service...*/
#include "wlan_hdd_main.h" /* hdd_err/warn... */
-#include "cdf_types.h" /* CDF_MODULE_ID_... */
+#include "qdf_types.h" /* QDF_MODULE_ID_... */
#include "ce_api.h"
/* guaranteed to be initialized to zero/NULL by the standard */
@@ -58,7 +58,7 @@
NAPI_DEBUG("-->");
- hif = cds_get_context(CDF_MODULE_ID_HIF);
+ hif = cds_get_context(QDF_MODULE_ID_HIF);
if (unlikely(NULL == hif))
CDF_ASSERT(NULL != hif); /* WARN */
else
@@ -110,7 +110,7 @@
NAPI_DEBUG("-->");
- hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (unlikely(NULL == hif_ctx)) {
CDF_ASSERT(NULL != hif_ctx);
rc = -EFAULT;
@@ -166,7 +166,7 @@
if (hdd_napi_map) {
struct hif_opaque_softc *hif_ctx;
- hif_ctx = cds_get_context(CDF_MODULE_ID_HIF);
+ hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
if (unlikely(NULL == hif_ctx))
CDF_ASSERT(NULL != hif_ctx);
else
@@ -210,7 +210,7 @@
struct hif_opaque_softc *hif;
int rc = 0; /* NOT enabled */
- hif = cds_get_context(CDF_MODULE_ID_HIF);
+ hif = cds_get_context(QDF_MODULE_ID_HIF);
if (unlikely(NULL == hif))
CDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */
else if (-1 == id)
@@ -243,7 +243,7 @@
NAPI_DEBUG("-->(event=%d, aux=%p)", event, data);
- hif = cds_get_context(CDF_MODULE_ID_HIF);
+ hif = cds_get_context(QDF_MODULE_ID_HIF);
if (unlikely(NULL == hif))
CDF_ASSERT(hif != NULL);
else
@@ -269,5 +269,5 @@
*/
int hdd_napi_poll(struct napi_struct *napi, int budget)
{
- return hif_napi_poll(cds_get_context(CDF_MODULE_ID_HIF), napi, budget);
+ return hif_napi_poll(cds_get_context(QDF_MODULE_ID_HIF), napi, budget);
}
diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c
index cc8543e..9b17d2f 100644
--- a/core/hdd/src/wlan_hdd_ocb.c
+++ b/core/hdd/src/wlan_hdd_ocb.c
@@ -546,7 +546,7 @@
/* Save the mac address to release later */
cdf_mem_copy(adapter->ocb_mac_address[
adapter->ocb_mac_addr_count].bytes,
- mac_addr, CDF_MAC_ADDR_SIZE);
+ mac_addr, QDF_MAC_ADDR_SIZE);
adapter->ocb_mac_addr_count++;
}
@@ -886,7 +886,7 @@
goto fail;
}
cdf_mem_copy(config->channels[i].mac_address.bytes,
- mac_addr, CDF_MAC_ADDR_SIZE);
+ mac_addr, QDF_MAC_ADDR_SIZE);
/* Save the mac address to release later */
cdf_copy_macaddr(&adapter->ocb_mac_address[
adapter->ocb_mac_addr_count],
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index 187cdc4..d877d4e 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -183,14 +183,14 @@
/* OEM message is always to a specific process and cannot be a broadcast */
if (p_hdd_ctx->oem_pid == 0) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: invalid dest pid", __func__);
return;
}
skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL);
if (skb == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: alloc_skb failed", __func__);
return;
}
@@ -223,7 +223,7 @@
*deviceMode = pAdapter->device_mode;
*vdevId = pAdapter->sessionId;
(*numInterfaces)++;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: numInterfaces: %d, deviceMode: %d, vdevId: %d",
__func__, *numInterfaces, *deviceMode,
*vdevId);
@@ -238,7 +238,7 @@
skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: sending App Reg Response length (%d) to process pid (%d)",
__func__, aniHdr->length, p_hdd_ctx->oem_pid);
@@ -265,7 +265,7 @@
skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL);
if (skb == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: alloc_skb failed", __func__);
return;
}
@@ -286,7 +286,7 @@
skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + aniHdr->length));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: sending oem error response to process pid (%d)",
__func__, app_pid);
@@ -314,13 +314,13 @@
/* OEM message is always to a specific process and cannot be a broadcast */
if (p_hdd_ctx->oem_pid == 0) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: invalid dest pid", __func__);
return;
}
if (length > OEM_DATA_RSP_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: invalid length of Oem Data response", __func__);
return;
}
@@ -328,7 +328,7 @@
skb = alloc_skb(NLMSG_SPACE(sizeof(tAniMsgHdr) + OEM_DATA_RSP_SIZE),
GFP_KERNEL);
if (skb == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: alloc_skb failed", __func__);
return;
}
@@ -348,7 +348,7 @@
skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: sending Oem Data Response of len (%d) to process pid (%d)",
__func__, length, p_hdd_ctx->oem_pid);
@@ -376,13 +376,13 @@
/* for now, STA interface only */
pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION);
if (!pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: No adapter for STA mode", __func__);
return QDF_STATUS_E_FAILURE;
}
if (!oemData) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: oemData is null", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -398,7 +398,7 @@
oemDataReqConfig.data_len = oemDataLen;
cdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: calling sme_oem_data_req", __func__);
status = sme_oem_data_req(p_hdd_ctx->hHal,
@@ -437,7 +437,7 @@
/* OEM message is always to a specific process and cannot be a broadcast */
if (p_hdd_ctx->oem_pid == 0) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: invalid dest pid", __func__);
return -EPERM;
}
@@ -446,7 +446,7 @@
numOfChannels * sizeof(tHddChannelInfo)),
GFP_KERNEL);
if (skb == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: alloc_skb failed", __func__);
return -ENOMEM;
}
@@ -498,7 +498,7 @@
/* channel info is not returned, fill in zeros in channel
* info struct
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: sme_get_reg_info failed for chan (%d), return info 0",
__func__, chanId);
hddChanInfo.chan_id = chanId;
@@ -516,7 +516,7 @@
skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: sending channel info resp for num channels (%d) to pid (%d)",
__func__, numOfChannels, p_hdd_ctx->oem_pid);
@@ -662,7 +662,7 @@
*
* Return: none
*/
-void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac,
+void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
uint8_t peerStatus,
uint8_t peerTimingMeasCap,
uint8_t sessionId,
@@ -674,7 +674,7 @@
tPeerStatusInfo *pPeerInfo;
if (!p_hdd_ctx || !p_hdd_ctx->hHal) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Either HDD Ctx is null or Hal Ctx is null",
__func__);
return;
@@ -682,7 +682,7 @@
/* check if oem app has registered and pid is valid */
if ((!p_hdd_ctx->oem_app_registered) || (p_hdd_ctx->oem_pid == 0)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"%s: OEM app is not registered(%d) or pid is invalid(%d)",
__func__, p_hdd_ctx->oem_app_registered,
p_hdd_ctx->oem_pid);
@@ -693,7 +693,7 @@
sizeof(tPeerStatusInfo)),
GFP_KERNEL);
if (skb == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: alloc_skb failed", __func__);
return;
}
@@ -741,7 +741,7 @@
}
skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"%s: sending peer " MAC_ADDRESS_STR
" status(%d), peerTimingMeasCap(%d), vdevId(%d), chanId(%d)"
" to oem app pid(%d), center freq 1 (%d), center freq 2 (%d),"
@@ -787,14 +787,14 @@
nlh = (struct nlmsghdr *)skb->data;
if (!nlh) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Netlink header null", __func__);
return -EPERM;
}
ret = wlan_hdd_validate_context(p_hdd_ctx);
if (0 != ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("HDD context is not valid"));
return ret;
}
@@ -802,7 +802,7 @@
msg_hdr = NLMSG_DATA(nlh);
if (!msg_hdr) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Message header null", __func__);
send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
OEM_ERR_NULL_MESSAGE_HEADER);
@@ -811,7 +811,7 @@
if (nlh->nlmsg_len <
NLMSG_LENGTH(sizeof(tAniMsgHdr) + msg_hdr->length)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid nl msg len, nlh->nlmsg_len (%d), msg_hdr->len (%d)",
__func__, nlh->nlmsg_len, msg_hdr->length);
send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -822,7 +822,7 @@
switch (msg_hdr->type) {
case ANI_MSG_APP_REG_REQ:
/* Registration request is only allowed for Qualcomm Application */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received App Req Req from App process pid(%d), len(%d)",
__func__, nlh->nlmsg_pid, msg_hdr->length);
@@ -830,7 +830,7 @@
if ((OEM_APP_SIGNATURE_LEN == msg_hdr->length) &&
(0 == strncmp(sign_str, OEM_APP_SIGNATURE_STR,
OEM_APP_SIGNATURE_LEN))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Valid App Req Req from oem app process pid(%d)",
__func__, nlh->nlmsg_pid);
@@ -838,7 +838,7 @@
p_hdd_ctx->oem_pid = nlh->nlmsg_pid;
send_oem_reg_rsp_nlink_msg();
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid signature in App Reg Request from pid(%d)",
__func__, nlh->nlmsg_pid);
send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -848,14 +848,14 @@
break;
case ANI_MSG_OEM_DATA_REQ:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received Oem Data Request length(%d) from pid: %d",
__func__, msg_hdr->length, nlh->nlmsg_pid);
if ((!p_hdd_ctx->oem_app_registered) ||
(nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) {
/* either oem app is not registered yet or pid is different */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: OEM DataReq: app not registered(%d) or incorrect pid(%d)",
__func__, p_hdd_ctx->oem_app_registered,
nlh->nlmsg_pid);
@@ -865,7 +865,7 @@
}
if ((!msg_hdr->length) || (OEM_DATA_REQ_SIZE < msg_hdr->length)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid length (%d) in Oem Data Request",
__func__, msg_hdr->length);
send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -878,14 +878,14 @@
break;
case ANI_MSG_CHANNEL_INFO_REQ:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received channel info request, num channel(%d) from pid: %d",
__func__, msg_hdr->length, nlh->nlmsg_pid);
if ((!p_hdd_ctx->oem_app_registered) ||
(nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) {
/* either oem app is not registered yet or pid is different */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Chan InfoReq: app not registered(%d) or incorrect pid(%d)",
__func__, p_hdd_ctx->oem_app_registered,
nlh->nlmsg_pid);
@@ -897,7 +897,7 @@
/* message length contains list of channel ids */
if ((!msg_hdr->length) ||
(WNI_CFG_VALID_CHANNEL_LIST_LEN < msg_hdr->length)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid length (%d) in channel info request",
__func__, msg_hdr->length);
send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -958,7 +958,7 @@
break;
default:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Received Invalid message type (%d), length (%d)",
__func__, msg_hdr->type, msg_hdr->length);
send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index fb48f5f..f38678d 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -48,7 +48,7 @@
#include <net/ieee80211_radiotap.h>
#include "wlan_hdd_tdls.h"
#include "wlan_hdd_trace.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "cdf_trace.h"
#include "cds_sched.h"
#include "cds_concurrency.h"
@@ -400,7 +400,7 @@
unsigned long rc;
hdd_cfg80211_state_t *cfg_state = WLAN_HDD_GET_CFG_STATE_PTR(adapter);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: ROC completion is not received.!!!",
__func__);
@@ -438,7 +438,7 @@
msecs_to_jiffies
(WAIT_CANCEL_REM_CHAN));
if (!rc) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Timeout occurred while waiting for RoC Cancellation",
__func__);
@@ -472,7 +472,7 @@
mutex_lock(&cfgState->remain_on_chan_ctx_lock);
while (pAdapter->is_roc_inprogress) {
mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: ROC in progress for session %d!!!",
__func__, pAdapter->sessionId);
msleep(500);
@@ -567,7 +567,7 @@
/* Initialize Remain on chan timer */
qdf_status =
cdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
wlan_hdd_remain_on_chan_timeout, pAdapter);
if (qdf_status != QDF_STATUS_SUCCESS) {
hddLog(CDF_TRACE_LEVEL_ERROR,
@@ -673,7 +673,7 @@
#endif
(SIR_MAC_MGMT_FRAME << 2) |
(SIR_MAC_MGMT_PROBE_REQ << 4), NULL, 0)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("wlansap_register_mgmt_frame return fail"));
wlansap_cancel_remain_on_channel(
#ifdef WLAN_FEATURE_MBSSID
@@ -949,12 +949,12 @@
if (0 != ret)
return ret;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_REMAIN_ON_CHANNEL,
pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST));
@@ -1000,7 +1000,7 @@
mutex_lock(&cfgState->remain_on_chan_ctx_lock);
pRemainChanCtx = cfgState->remain_on_chan_ctx;
if (pRemainChanCtx != NULL) {
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_REMAINCHANREADYHANDLER,
pAdapter->sessionId,
pRemainChanCtx->duration));
@@ -1094,7 +1094,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -1255,12 +1255,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_ACTION, pAdapter->sessionId,
pAdapter->device_mode));
status = wlan_hdd_validate_context(pHddCtx);
@@ -1576,7 +1576,7 @@
sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter),
sessionId, buf, len, extendedWait, noack,
current_freq)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: sme_send_action returned fail", __func__);
goto err;
}
@@ -1723,19 +1723,19 @@
param = strnchr(command, strlen(command), ' ');
if (param == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: strnchr failed to find delimeter", __func__);
return -EINVAL;
}
param++;
ret = sscanf(param, "%d %d %d", &count, &start_time, &duration);
if (ret != 3) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: P2P_SET GO NoA: fail to read params, ret=%d",
__func__, ret);
return -EINVAL;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: P2P_SET GO NoA: count=%d start_time=%d duration=%d",
__func__, count, start_time, duration);
duration = MS_TO_MUS(duration);
@@ -1758,7 +1758,7 @@
NoA.count = count;
NoA.sessionid = pAdapter->sessionId;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
"interval %d count %d single noa duration %d "
"PsSelection %x", __func__, NoA.opp_ps,
@@ -1801,19 +1801,19 @@
param = strnchr(command, strlen(command), ' ');
if (param == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: strnchr failed to find delimiter", __func__);
return -EINVAL;
}
param++;
ret = sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow);
if (ret != 3) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: P2P_SET GO PS: fail to read params, ret=%d",
__func__, ret);
return -EINVAL;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d",
__func__, legacy_ps, opp_ps, ctwindow);
@@ -1831,7 +1831,7 @@
*/
if (ctwindow != -1) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"Opportunistic Power Save is %s",
(true == pAdapter->ops) ? "Enable" : "Disable");
@@ -1849,7 +1849,7 @@
P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
NoA.sessionid = pAdapter->sessionId;
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
"interval %d count %d single noa duration %d "
@@ -1878,7 +1878,7 @@
NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
NoA.sessionid = pAdapter->sessionId;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
"interval %d count %d single noa duration %d "
"PsSelection %x", __func__, NoA.opp_ps,
@@ -1952,7 +1952,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return ERR_PTR(-EINVAL);
}
@@ -1961,7 +1961,7 @@
if (0 != ret)
return ERR_PTR(ret);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type));
/*
* Allow addition multiple interfaces for WLAN_HDD_P2P_GO,
@@ -2004,7 +2004,7 @@
* Generate the P2P Interface Address. this address must be
* different from the P2P Device Address.
*/
- struct cdf_mac_addr p2pDeviceAddress =
+ struct qdf_mac_addr p2pDeviceAddress =
pHddCtx->p2pDeviceAddress;
p2pDeviceAddress.bytes[4] ^= 0x80;
pAdapter = hdd_open_adapter(pHddCtx,
@@ -2048,12 +2048,12 @@
int status;
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_DEL_VIRTUAL_INTF,
pVirtAdapter->sessionId, pVirtAdapter->device_mode));
hddLog(LOG1, FL("Device_mode %s(%d)"),
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 68e69c9..ff0cbc5 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -41,7 +41,7 @@
#if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK)
#include <linux/wakelock.h>
#endif
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "sme_api.h"
#include <cds_api.h>
#include <cds_sched.h>
@@ -120,14 +120,14 @@
&hddGtkOffloadReqParams,
pAdapter->sessionId);
if (QDF_STATUS_SUCCESS != ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: sme_set_gtk_offload failed, returned %d",
__func__, ret);
return;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: sme_set_gtk_offload successfull",
__func__);
}
@@ -146,13 +146,13 @@
wlan_hdd_cfg80211_update_replay_counter_callback,
pAdapter, pAdapter->sessionId);
if (QDF_STATUS_SUCCESS != ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: sme_get_gtk_offload failed, returned %d",
__func__, ret);
return;
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: sme_get_gtk_offload successful",
__func__);
@@ -169,13 +169,13 @@
&hddGtkOffloadReqParams,
pAdapter->sessionId);
if (QDF_STATUS_SUCCESS != ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: failed to dissable GTK offload, returned %d",
__func__, ret);
return;
}
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: successfully dissabled GTK offload request to HAL",
__func__);
@@ -1097,7 +1097,7 @@
hdd_info("%s: WLAN being suspended by OS", __func__);
- pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
if (!pHddCtx) {
hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
__func__);
@@ -1154,7 +1154,7 @@
hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS",
__func__);
- pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
if (!pHddCtx) {
hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
__func__);
@@ -1288,7 +1288,7 @@
}
/* Get the HDD context. */
- pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
if (!pHddCtx) {
hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
__func__);
@@ -1346,7 +1346,7 @@
qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to stop WMA", __func__);
CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
wma_setneedshutdown(p_cds_context);
@@ -1358,7 +1358,7 @@
*/
qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to stop sme %d", __func__, qdf_status);
CDF_ASSERT(0);
}
@@ -1367,7 +1367,7 @@
/* Stop MAC (PE and HAL) */
qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to stop mac %d", __func__, qdf_status);
CDF_ASSERT(0);
}
@@ -1420,7 +1420,7 @@
}
/* Get the HDD context */
- pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
if (!pHddCtx) {
hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
__func__);
@@ -1445,7 +1445,7 @@
}
/* Save the hal context in Adapter */
- pHddCtx->hHal = cds_get_context(CDF_MODULE_ID_SME);
+ pHddCtx->hHal = cds_get_context(QDF_MODULE_ID_SME);
if (NULL == pHddCtx->hHal) {
hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HAL context is null",
__func__);
@@ -1726,7 +1726,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -1752,7 +1752,7 @@
#endif
hdd_resume_wlan();
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_RESUME_WLAN,
NO_SESSION, pHddCtx->isWiphySuspended));
cdf_spin_lock(&pHddCtx->sched_scan_lock);
@@ -1862,7 +1862,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -2015,7 +2015,7 @@
}
pHddCtx->is_ol_rx_thread_suspended = true;
#endif
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN,
NO_SESSION, pHddCtx->isWiphySuspended));
pHddCtx->isWiphySuspended = true;
@@ -2082,12 +2082,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT,
pAdapter->sessionId, timeout));
@@ -2169,18 +2169,18 @@
{
hdd_context_t *pHddCtx = (hdd_context_t *) wiphy_priv(wiphy);
tHalHandle hHal = NULL;
- struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
- struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
int status;
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_TXPOWER,
NO_SESSION, type));
@@ -2267,7 +2267,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -2284,7 +2284,7 @@
return -ENOENT;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_GET_TXPOWER,
pAdapter->sessionId, pAdapter->device_mode));
wlan_hdd_get_class_astats(pAdapter);
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 48ba11e..71a0e3e 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -408,7 +408,7 @@
* doesn't exceed IW_MAX_BITRATES
*/
- maxNumRates = CDF_MIN(maxNumRates, IW_MAX_BITRATES);
+ maxNumRates = QDF_MIN(maxNumRates, IW_MAX_BITRATES);
if ((maxNumRates - numBasicRates) > MAX_RATES) {
no_of_rates = MAX_RATES;
@@ -473,7 +473,7 @@
event.cmd = IWEVQUAL;
event.u.qual.qual = descriptor->rssi;
event.u.qual.noise = descriptor->sinr;
- event.u.qual.level = CDF_MIN((descriptor->rssi + descriptor->sinr), 0);
+ event.u.qual.level = QDF_MIN((descriptor->rssi + descriptor->sinr), 0);
event.u.qual.updated = IW_QUAL_ALL_UPDATED;
@@ -748,7 +748,7 @@
/* set bssid using sockaddr from iw_scan_req */
cdf_mem_copy(scanRequest.bssid.bytes,
&scanReq->bssid.sa_data,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
@@ -766,7 +766,7 @@
scanReq->essid_len);
} else {
scanRequest.SSIDs.numOfSSIDs = 0;
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Unable to allocate memory",
__func__);
@@ -833,7 +833,7 @@
pAdapter->sessionId, &scanRequest,
&hdd_scan_request_callback, dev);
if (!QDF_IS_STATUS_SUCCESS(status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s:sme_scan_request fail %d!!!", __func__, status);
goto error;
}
@@ -904,12 +904,12 @@
if (0 != ret)
return ret;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: enter buffer length %d!!!", __func__,
(wrqu->data.length) ? wrqu->data.length : IW_SCAN_MAX_DATA);
if (true == pAdapter->scan_info.mScanPending) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s:mScanPending is true !!!", __func__);
return -EAGAIN;
}
@@ -945,7 +945,7 @@
sme_scan_result_purge(hHal, pResult);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: exit total %d BSS reported !!!", __func__, i);
EXIT();
return status;
@@ -1245,12 +1245,12 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SCAN,
pAdapter->sessionId, request->n_channels));
@@ -2031,7 +2031,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -2059,7 +2059,7 @@
return -EBUSY;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START,
pAdapter->sessionId, pAdapter->device_mode));
/*
@@ -2132,7 +2132,7 @@
&& (CHANNEL_STATE_DFS ==
cds_get_channel_state(
channels_allowed[indx]))) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s : Dropping DFS channel : %d",
__func__,
@@ -2157,7 +2157,7 @@
* then ignore the PNO request
*/
if (num_ignore_dfs_ch == request->n_channels) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s : All requested channels are DFS channels",
__func__);
ret = -EINVAL;
@@ -2306,7 +2306,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -2355,7 +2355,7 @@
pPnoRequest->enable = 0; /* Disable PNO */
pPnoRequest->ucNetworksCount = 0;
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP,
pAdapter->sessionId, pAdapter->device_mode));
status = sme_set_preferred_network_list(hHal, pPnoRequest,
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 1dddcd6..e95a24e 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -32,9 +32,9 @@
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/etherdevice.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
#include <ani_global.h>
-#include <cdf_types.h>
+#include <qdf_types.h>
#include <net/ieee80211_radiotap.h>
#include <cds_sched.h>
#include <wlan_hdd_napi.h>
@@ -58,25 +58,25 @@
*/
static void hdd_softap_dump_sk_buff(struct sk_buff *skb)
{
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: head = %p ", __func__, skb->head);
- /* CDF_TRACE( CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ /* CDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: tail = %p ", __func__, skb->tail);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: end = %p ", __func__, skb->end);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: len = %d ", __func__, skb->len);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: data_len = %d ", __func__, skb->data_len);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: mac_len = %d", __func__, skb->mac_len);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_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]);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_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]);
@@ -103,7 +103,7 @@
hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context;
if (!pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: INV ARG", __func__);
/* INVALID ARG */
return;
@@ -129,7 +129,7 @@
hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context;
if (!pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: INV ARG", __func__);
/* INVALID ARG */
return;
@@ -168,7 +168,7 @@
sme_ac_enum_type ac = SME_AC_BE;
hdd_adapter_t *pAdapter = (hdd_adapter_t *) netdev_priv(dev);
hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter);
- struct cdf_mac_addr *pDestMacAddress;
+ struct qdf_mac_addr *pDestMacAddress;
uint8_t STAId;
uint8_t proto_type = 0;
#ifdef QCA_PKT_PROTO_TRACE
@@ -181,7 +181,7 @@
* lead to a crash.
*/
if (cds_is_driver_recovering()) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH,
"%s: Recovery in Progress. Ignore!!!", __func__);
goto drop_pkt;
}
@@ -198,7 +198,7 @@
goto drop_pkt;
}
- pDestMacAddress = (struct cdf_mac_addr *) skb->data;
+ pDestMacAddress = (struct qdf_mac_addr *) skb->data;
if (cdf_is_macaddr_broadcast(pDestMacAddress) ||
cdf_is_macaddr_group(pDestMacAddress)) {
@@ -211,19 +211,19 @@
if (QDF_STATUS_SUCCESS !=
hdd_softap_get_sta_id(pAdapter,
pDestMacAddress, &STAId)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
CDF_TRACE_LEVEL_WARN,
"%s: Failed to find right station", __func__);
goto drop_pkt;
}
if (STAId == HDD_WLAN_INVALID_STA_ID) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
CDF_TRACE_LEVEL_WARN,
"%s: Failed to find right station", __func__);
goto drop_pkt;
} else if (false == pAdapter->aStaInfo[STAId].isUsed) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
CDF_TRACE_LEVEL_WARN,
"%s: STA %d is unregistered", __func__,
STAId);
@@ -234,14 +234,14 @@
pAdapter->aStaInfo[STAId].tlSTAState)
&& (ol_txrx_peer_state_auth !=
pAdapter->aStaInfo[STAId].tlSTAState)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
CDF_TRACE_LEVEL_WARN,
"%s: Station not connected yet", __func__);
goto drop_pkt;
} else if (ol_txrx_peer_state_conn ==
pAdapter->aStaInfo[STAId].tlSTAState) {
if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
CDF_TRACE_LEVEL_WARN,
"%s: NON-EAPOL packet in non-Authenticated state",
__func__);
@@ -314,7 +314,7 @@
if (ol_tx_send_data_frame(STAId, skb,
proto_type) != NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN,
"%s: Failed to send packet to txrx for staid:%d",
__func__, STAId);
++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
@@ -358,7 +358,7 @@
DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT,
NULL, 0));
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Transmission timeout occurred", __func__);
/* Getting here implies we disabled the TX queues for too
* long. Queues are disabled either because of disassociation
@@ -368,7 +368,7 @@
*/
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
if (cds_is_driver_recovering()) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Recovery in Progress. Ignore!!!", __func__);
return;
}
@@ -436,11 +436,11 @@
* QDF_STATUS_SUCCESS otherwise
*/
QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId,
- struct cdf_mac_addr *pmacAddrSTA)
+ struct qdf_mac_addr *pmacAddrSTA)
{
spin_lock_bh(&pAdapter->staInfo_lock);
if (pAdapter->aStaInfo[STAId].isUsed) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Reinit station %d", __func__, STAId);
spin_unlock_bh(&pAdapter->staInfo_lock);
return QDF_STATUS_E_FAILURE;
@@ -475,7 +475,7 @@
if (false == pAdapter->aStaInfo[STAId].isUsed) {
spin_unlock_bh(&pAdapter->staInfo_lock);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Deinit station not inited %d", __func__, STAId);
return QDF_STATUS_E_FAILURE;
}
@@ -514,14 +514,14 @@
/* Sanity check on inputs */
if ((NULL == cds_context) || (NULL == rxBuf)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Null params being passed", __func__);
return QDF_STATUS_E_FAILURE;
}
- pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
if (NULL == pHddCtx) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: HDD context is Null", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -543,7 +543,7 @@
if (skb->dev == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: ERROR!!Invalid netdevice", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -608,13 +608,13 @@
hdd_context_t *pHddCtx;
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: pAdapter is NULL", __func__);
return QDF_STATUS_E_INVAL;
}
if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid pAdapter magic", __func__);
return QDF_STATUS_E_INVAL;
}
@@ -626,7 +626,7 @@
*/
qdf_status = ol_txrx_clear_peer(staId);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"ol_txrx_clear_peer() failed to for staID %d. "
"Status= %d [0x%08X]", staId, qdf_status, qdf_status);
}
@@ -661,7 +661,7 @@
uint8_t staId,
uint8_t ucastSig,
uint8_t bcastSig,
- struct cdf_mac_addr *pPeerMacAddress,
+ struct qdf_mac_addr *pPeerMacAddress,
bool fWmmEnabled)
{
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
@@ -672,7 +672,7 @@
* Clean up old entry if it is not cleaned up properly
*/
if (pAdapter->aStaInfo[staId].isUsed) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"clean up old entry for STA %d", staId);
hdd_softap_deregister_sta(pAdapter, staId);
}
@@ -688,7 +688,7 @@
pPeerMacAddress);
staDesc.is_qos_enabled = fWmmEnabled;
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"HDD SOFTAP register TL QoS_enabled=%d",
staDesc.is_qos_enabled);
@@ -697,7 +697,7 @@
ol_txrx_register_peer(hdd_softap_rx_packet_cbk,
&staDesc);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]",
qdf_status, qdf_status);
return qdf_status;
@@ -713,7 +713,7 @@
pAdapter->aStaInfo[staId].isQosEnabled = fWmmEnabled;
if (!fAuthRequired) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time",
pAdapter->aStaInfo[staId].ucSTAId);
@@ -727,7 +727,7 @@
pAdapter->sessionCtx.ap.uIsAuthenticated = true;
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"ULA auth StaId= %d. Changing TL state to CONNECTED at Join time",
pAdapter->aStaInfo[staId].ucSTAId);
@@ -760,8 +760,8 @@
{
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- struct cdf_mac_addr broadcastMacAddr =
- CDF_MAC_ADDR_BROADCAST_INITIALIZER;
+ struct qdf_mac_addr broadcastMacAddr =
+ QDF_MAC_ADDR_BROADCAST_INITIALIZER;
hdd_ap_ctx_t *pHddApCtx;
pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter);
@@ -810,7 +810,7 @@
* unloading
*/
if (cds_is_load_or_unload_in_progress()) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!",
__func__, cds_get_driver_state());
return QDF_STATUS_E_PERM;
@@ -819,7 +819,7 @@
qdf_status = hdd_softap_deregister_bc_sta(pAdapter);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to deregister BC sta Id %d", __func__,
(WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId);
}
@@ -829,7 +829,7 @@
if (pAdapter->aStaInfo[staId].isUsed) {
qdf_status = hdd_softap_deregister_sta(pAdapter, staId);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
CDF_TRACE_LEVEL_ERROR,
"%s: Failed to deregister sta Id %d",
__func__, staId);
@@ -848,19 +848,19 @@
* Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error
*/
QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
- struct cdf_mac_addr *pDestMacAddress,
+ struct qdf_mac_addr *pDestMacAddress,
enum ol_txrx_peer_state state)
{
uint8_t ucSTAId = WLAN_MAX_STA_COUNT;
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"%s: enter", __func__);
if (QDF_STATUS_SUCCESS !=
hdd_softap_get_sta_id(pAdapter,
pDestMacAddress, &ucSTAId)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Failed to find right station", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -868,7 +868,7 @@
if (false ==
cdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA,
pDestMacAddress)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Station MAC address does not matching",
__func__);
return QDF_STATUS_E_FAILURE;
@@ -876,7 +876,7 @@
qdf_status =
hdd_change_peer_state(pAdapter, ucSTAId, state, false);
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"%s: change station to state %d succeed", __func__, state);
if (QDF_STATUS_SUCCESS == qdf_status) {
@@ -884,7 +884,7 @@
ol_txrx_peer_state_auth;
}
- CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
"%s exit", __func__);
return qdf_status;
@@ -901,7 +901,7 @@
* not found
*/
QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter,
- struct cdf_mac_addr *pMacAddress,
+ struct qdf_mac_addr *pMacAddress,
uint8_t *staId)
{
uint8_t i;
@@ -909,7 +909,7 @@
for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
if (cdf_mem_compare
(&pAdapter->aStaInfo[i].macAddrSTA, pMacAddress,
- CDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) {
+ QDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) {
*staId = i;
return QDF_STATUS_SUCCESS;
}
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index af723a4..ad81149 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -261,7 +261,7 @@
stats->type) ||
nla_put(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_MAC_ADDRESS,
- CDF_MAC_ADDR_SIZE, &stats->peerMacAddress.bytes[0]) ||
+ QDF_MAC_ADDR_SIZE, &stats->peerMacAddress.bytes[0]) ||
nla_put_u32(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_CAPABILITIES,
stats->capabilities) ||
@@ -385,7 +385,7 @@
stats->mode) ||
nla_put(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MAC_ADDR,
- CDF_MAC_ADDR_SIZE, stats->macAddr.bytes) ||
+ QDF_MAC_ADDR_SIZE, stats->macAddr.bytes) ||
nla_put_u32(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_STATE,
stats->state) ||
@@ -400,7 +400,7 @@
strlen(stats->ssid), stats->ssid) ||
nla_put(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_BSSID,
- CDF_MAC_ADDR_SIZE, stats->bssid.bytes) ||
+ QDF_MAC_ADDR_SIZE, stats->bssid.bytes) ||
nla_put(vendor_event,
QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_AP_COUNTRY_STR,
WNI_CFG_COUNTRY_CODE_LEN, stats->apCountryStr) ||
@@ -1002,13 +1002,13 @@
linkLayerStatsResults->ifaceId);
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: vdev_id %d does not exist with host",
__func__, linkLayerStatsResults->ifaceId);
return;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Link Layer Indication indType: %d", __func__, indType);
switch (indType) {
@@ -1144,7 +1144,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1270,7 +1270,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1401,7 +1401,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1546,7 +1546,7 @@
if (ret_val)
return ret_val;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -1607,7 +1607,7 @@
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: HDD context is not valid", __func__);
return;
}
@@ -1615,7 +1615,7 @@
pAdapter = hdd_get_adapter_by_vdev(pHddCtx, data->vdev_id);
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: vdev_id %d does not exist with host",
__func__, data->vdev_id);
return;
@@ -1630,7 +1630,7 @@
GFP_KERNEL);
if (!vendor_event) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: cfg80211_vendor_event_alloc failed", __func__);
return;
}
@@ -1638,7 +1638,7 @@
ret_val = nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_IFINDEX,
pAdapter->dev->ifindex);
if (ret_val) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: QCA_WLAN_VENDOR_ATTR_IFINDEX put fail",
__func__);
kfree_skb(vendor_event);
@@ -1650,7 +1650,7 @@
data->event_data_len, data->event_data);
if (ret_val) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: QCA_WLAN_VENDOR_ATTR_STATS_EXT put fail",
__func__);
kfree_skb(vendor_event);
@@ -1723,7 +1723,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -2161,7 +2161,7 @@
sinfo->txrate.mcs, sinfo->txrate.flags,
sinfo->tx_packets, sinfo->rx_packets);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_GET_STA,
pAdapter->sessionId, maxRate));
EXIT();
@@ -2234,7 +2234,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
@@ -2272,7 +2272,7 @@
wlan_hdd_get_snr(pAdapter, &snr);
wlan_hdd_get_rssi(pAdapter, &rssi);
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_DUMP_SURVEY,
pAdapter->sessionId, pAdapter->device_mode));
diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c
index 96d0377..205865e 100644
--- a/core/hdd/src/wlan_hdd_subnet_detect.c
+++ b/core/hdd/src/wlan_hdd_subnet_detect.c
@@ -46,15 +46,15 @@
policy[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_MAX + 1] = {
[PARAM_MAC_ADDR] = {
.type = NLA_BINARY,
- .len = CDF_MAC_ADDR_SIZE
+ .len = QDF_MAC_ADDR_SIZE
},
[PARAM_IPV4_ADDR] = {
.type = NLA_BINARY,
- .len = CDF_IPV4_ADDR_SIZE
+ .len = QDF_IPV4_ADDR_SIZE
},
[PARAM_IPV6_ADDR] = {
.type = NLA_BINARY,
- .len = CDF_IPV6_ADDR_SIZE
+ .len = QDF_IPV6_ADDR_SIZE
}
};
@@ -121,20 +121,20 @@
return -EINVAL;
}
nla_memcpy(req.gw_mac_addr.bytes, tb[PARAM_MAC_ADDR],
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
/* req ipv4_addr_type and ipv6_addr_type are initially false due
* to zeroing the struct
*/
if (tb[PARAM_IPV4_ADDR]) {
nla_memcpy(req.ipv4_addr, tb[PARAM_IPV4_ADDR],
- CDF_IPV4_ADDR_SIZE);
+ QDF_IPV4_ADDR_SIZE);
req.ipv4_addr_type = true;
}
if (tb[PARAM_IPV6_ADDR]) {
nla_memcpy(&req.ipv6_addr, tb[PARAM_IPV6_ADDR],
- CDF_IPV6_ADDR_SIZE);
+ QDF_IPV6_ADDR_SIZE);
req.ipv6_addr_type = true;
}
diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c
index cd6d9f7..375e547 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -196,7 +196,7 @@
hddTdlsPeer_t *curr_candidate)
{
if (!pHddTdlsCtx || !curr_candidate) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: either pHddTdlsCtx or curr_candidate is null",
__func__);
return;
@@ -266,7 +266,7 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if ((NULL == pHddTdlsCtx) || (NULL == pHddCtx)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx or pHddTdlsCtx points to NULL"));
return;
}
@@ -293,7 +293,7 @@
static void wlan_hdd_tdls_free_scan_request(tdls_scan_context_t *tdls_scan_ctx)
{
if (NULL == tdls_scan_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("tdls_scan_ctx is NULL"));
return;
}
@@ -325,7 +325,7 @@
pHddTdlsCtx = (tdlsCtx_t *) userData;
if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddTdlsCtx or pAdapter points to NULL"));
return;
}
@@ -381,7 +381,7 @@
struct list_head *pos, *q;
if (NULL == pHddTdlsCtx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddTdlsCtx is NULL"));
return;
}
@@ -408,7 +408,7 @@
container_of(work, tdls_scan_context_t, tdls_scan_work.work);
if (NULL == scan_ctx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("scan_ctx is NULL"));
return;
}
@@ -584,7 +584,7 @@
cdf_mem_zero(pHddTdlsCtx, sizeof(tdlsCtx_t));
cdf_mc_timer_init(&pHddTdlsCtx->peerDiscoveryTimeoutTimer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
wlan_hdd_tdls_discovery_timeout_peer_cb,
pHddTdlsCtx);
@@ -624,7 +624,7 @@
pHddCtx->tdlsConnInfo[staIdx].staId = 0;
pHddCtx->tdlsConnInfo[staIdx].sessionId = 255;
cdf_mem_zero(&pHddCtx->tdlsConnInfo[staIdx].peerMac,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
pHddTdlsCtx->pAdapter = pAdapter;
@@ -748,7 +748,7 @@
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if (!pHddCtx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx is NULL"));
return;
}
@@ -972,19 +972,19 @@
int32_t res = 0;
hdd_context_t *pHddCtx;
if (curr_peer == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("curr_peer is NULL"));
return;
}
if (curr_peer->pHddTdlsCtx == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("curr_peer->pHddTdlsCtx is NULL"));
return;
}
pHddCtx = WLAN_HDD_GET_CTX(curr_peer->pHddTdlsCtx->pAdapter);
if (0 != (wlan_hdd_validate_context(pHddCtx))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx is not valid"));
return;
}
@@ -1041,13 +1041,13 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if (0 != (wlan_hdd_validate_context(pHddCtx))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx is not valid"));
return;
}
curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, true);
if (curr_peer == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("curr_peer is NULL"));
return;
}
@@ -1943,7 +1943,7 @@
list_for_each(pos, head) {
curr_peer = list_entry(pos, hddTdlsPeer_t, node);
if (!memcmp(mac, curr_peer->peerMac, 6)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"findTdlsPeer: found staId %d",
curr_peer->staId);
if (mutexLock)
@@ -2081,7 +2081,7 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if (0 != (wlan_hdd_validate_context(pHddCtx))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx is not valid"));
return 0;
}
@@ -2167,7 +2167,7 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx or pHddTdlsCtx points to NULL"));
return;
}
@@ -2201,7 +2201,7 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx or pHddTdlsCtx points to NULL"));
return;
}
@@ -2212,7 +2212,7 @@
if (NULL == pHddTdlsCtx) {
mutex_unlock(&pHddCtx->tdls_lock);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddTdlsCtx is NULL"));
return;
}
@@ -2322,7 +2322,7 @@
tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);;
if (NULL == pHddTdlsCtx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddTdlsCtx is NULL"));
return NULL;
}
@@ -2409,13 +2409,13 @@
ENTER();
if (NULL == pHddTdlsCtx) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddTdlsCtx is NULL"));
return;
}
if (unlikely(TDLS_CTX_MAGIC != pHddTdlsCtx->magic)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: tdls magic number mis-match %u",
__func__, pHddTdlsCtx->magic);
return;
@@ -2431,7 +2431,7 @@
curr_peer = pHddTdlsCtx->curr_candidate;
if (NULL == curr_peer) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("pHddCtx is not valid"));
goto done;
}
@@ -2463,7 +2463,7 @@
if (false == curr_peer->isForcedPeer) {
if (curr_peer->discovery_attempt >=
pHddTdlsCtx->threshold_config.discovery_tries_n) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: discovery attempt (%d) reached max (%d) for peer "
MAC_ADDRESS_STR
", ignore discovery trigger from fw",
@@ -2865,7 +2865,7 @@
hddTdlsPeer_t *curr_peer, uint16_t reason)
{
if (NULL == pAdapter || NULL == curr_peer) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("parameters passed are invalid"));
return;
}
@@ -2978,7 +2978,7 @@
curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, false);
if (curr_peer == NULL) {
mutex_unlock(&pHddCtx->tdls_lock);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("curr_peer is NULL"));
*state = QCA_WIFI_HAL_TDLS_DISABLED;
*reason = eTDLS_LINK_UNSPECIFIED;
@@ -3064,7 +3064,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3192,7 +3192,7 @@
reason, state, global_operating_class, channel,
MAC_ADDR_ARRAY(mac));
if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_MAC_ADDR,
- CDF_MAC_ADDR_SIZE, mac) ||
+ QDF_MAC_ADDR_SIZE, mac) ||
nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_NEW_STATE,
state) ||
nla_put_s32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_REASON,
@@ -3243,7 +3243,7 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3362,7 +3362,7 @@
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1];
QDF_STATUS status;
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hdd_err("Command not allowed in FTM mode");
return -EPERM;
}
@@ -3501,7 +3501,7 @@
but need to check if any other errno fit into this category. */
numCurrTdlsPeers = wlan_hdd_tdls_connected_peers(pAdapter);
if (pHddCtx->max_num_tdls_sta <= numCurrTdlsPeers) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" TDLS Max peer already connected. Request declined."
" Num of peers (%d), Max allowed (%d).",
@@ -3512,7 +3512,7 @@
hddTdlsPeer_t *pTdlsPeer;
pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac, true);
if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" already connected. Request declined.",
__func__, MAC_ADDR_ARRAY(mac));
@@ -3552,7 +3552,7 @@
}
{
int i = 0;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"Supported rates:");
for (i = 0; i < sizeof(StaParams->supported_rates); i++)
hddLog(LOG1, "[%d]: %x ", i,
@@ -3560,7 +3560,7 @@
}
} /* end debug code */
else if ((1 == update) && (NULL == StaParams)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s : update is true, but staParams is NULL. Error!",
__func__);
return -EPERM;
@@ -3582,14 +3582,14 @@
(WAIT_TIME_TDLS_ADD_STA));
if (!rc) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: timeout waiting for tdls add station indication",
__func__);
return -EPERM;
}
if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Add Station is unsuccessful", __func__);
return -EPERM;
}
@@ -3670,7 +3670,7 @@
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_context_t *pHddCtx = wiphy_priv(wiphy);
hdd_station_ctx_t *hdd_sta_ctx;
- u8 peerMac[CDF_MAC_ADDR_SIZE];
+ u8 peerMac[QDF_MAC_ADDR_SIZE];
QDF_STATUS status;
int max_sta_failed = 0;
int responder;
@@ -3683,17 +3683,17 @@
#endif
#endif
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
pAdapter->sessionId, action_code));
if (0 != wlan_hdd_validate_context(pHddCtx)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: HDD context is not valid", __func__);
return -EINVAL;
}
@@ -3722,14 +3722,14 @@
}
/* If any concurrency is detected */
- if (((1 << CDF_STA_MODE) != pHddCtx->concurrency_mode) ||
- (pHddCtx->no_of_active_sessions[CDF_STA_MODE] > 1)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) ||
+ (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) {
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"%s: Multiple STA OR Concurrency detected. Ignore TDLS MGMT frame. action_code=%d, concurrency_mode: 0x%x, active_sessions: %d",
__func__,
action_code,
pHddCtx->concurrency_mode,
- pHddCtx->no_of_active_sessions[CDF_STA_MODE]);
+ pHddCtx->no_of_active_sessions[QDF_STA_MODE]);
return -EPERM;
}
/* other than teardown frame, mgmt frames are not sent if disabled */
@@ -3746,7 +3746,7 @@
if (WLAN_IS_TDLS_SETUP_ACTION(action_code)) {
if (NULL != wlan_hdd_tdls_is_progress(pHddCtx, peer, true)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" TDLS setup is ongoing. action %d declined.",
__func__, MAC_ADDR_ARRAY(peer), action_code);
@@ -3763,7 +3763,7 @@
check again in addtion to add_station().
Anyway, there is no hard to double-check. */
if (SIR_MAC_TDLS_SETUP_REQ == action_code) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).",
@@ -3775,7 +3775,7 @@
/* maximum reached. tweak to send error code to peer and return
error code to supplicant */
status_code = eSIR_MAC_UNSPEC_FAILURE_STATUS;
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).",
@@ -3791,7 +3791,7 @@
pTdlsPeer =
wlan_hdd_tdls_find_peer(pAdapter, peer, true);
if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s:" MAC_ADDRESS_STR
" already connected. action %d declined.",
@@ -3819,7 +3819,7 @@
if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer))
responder = pTdlsPeer->is_responder;
else {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" peer doesn't exist or not connected %d dialog_token %d status %d, len = %zu",
__func__, MAC_ADDR_ARRAY(peer),
@@ -3843,7 +3843,7 @@
/* make sure doesn't call send_mgmt() while it is pending */
if (TDLS_CTX_MAGIC == pAdapter->mgmtTxCompletionStatus) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: " MAC_ADDRESS_STR
" action %d couldn't sent, as one is pending. return EBUSY",
__func__, MAC_ADDR_ARRAY(peer), action_code);
@@ -3860,7 +3860,7 @@
!responder);
if (QDF_STATUS_SUCCESS != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: sme_send_tdls_mgmt_frame failed!", __func__);
pAdapter->mgmtTxCompletionStatus = false;
return -EINVAL;
@@ -3882,7 +3882,7 @@
msecs_to_jiffies(WAIT_TIME_TDLS_MGMT));
if ((0 == rc) || (true != pAdapter->mgmtTxCompletionStatus)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Mgmt Tx Completion timed out TxCompletion %u",
__func__, pAdapter->mgmtTxCompletionStatus);
@@ -4028,25 +4028,25 @@
{
hddTdlsPeer_t *pTdlsPeer;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s : NL80211_TDLS_SETUP for " MAC_ADDRESS_STR,
__func__, MAC_ADDR_ARRAY(peer));
if ((false == pHddCtx->config->fTDLSExternalControl) ||
(false == pHddCtx->config->fEnableTDLSImplicitTrigger)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s TDLS External control or Implicit Trigger not enabled ",
__func__);
return -ENOTSUPP;
}
pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, peer);
if (pTdlsPeer == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: peer " MAC_ADDRESS_STR " does not exist",
__func__, MAC_ADDR_ARRAY(peer));
return -EINVAL;
}
if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, true)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s TDLS Add Force Peer Failed", __func__);
return -EINVAL;
}
@@ -4070,13 +4070,13 @@
if (0 != wlan_hdd_tdls_set_extctrl_param(pAdapter, peer,
chan, max_latency,
op_class, min_bandwidth)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s TDLS Set Peer's External Ctrl Parameter Failed",
__func__);
return -EINVAL;
}
if (0 != wlan_hdd_set_callback(pTdlsPeer, callback)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s TDLS set callback Failed", __func__);
return -EINVAL;
}
@@ -4096,12 +4096,12 @@
{
hddTdlsPeer_t *pTdlsPeer;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s : NL80211_TDLS_TEARDOWN for " MAC_ADDRESS_STR,
__func__, MAC_ADDR_ARRAY(peer));
if ((false == pHddCtx->config->fTDLSExternalControl) ||
(false == pHddCtx->config->fEnableTDLSImplicitTrigger)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s TDLS External control or Implicit Trigger not enabled ",
__func__);
return -ENOTSUPP;
@@ -4117,7 +4117,7 @@
eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON);
}
if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, false)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s Failed", __func__);
return -EINVAL;
}
@@ -4131,7 +4131,7 @@
return -EINVAL;
}
if (0 != wlan_hdd_set_callback(pTdlsPeer, NULL)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s TDLS set callback Failed", __func__);
return -EINVAL;
}
@@ -4162,16 +4162,16 @@
ENTER();
- if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+ if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
}
- MTRACE(cdf_trace(CDF_MODULE_ID_HDD,
+ MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_OPER,
pAdapter->sessionId, oper));
if (NULL == peer) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid arguments", __func__);
return -EINVAL;
}
@@ -4185,7 +4185,7 @@
* received from target, so HDD config gives combined intersected result
*/
if (false == pHddCtx->config->fEnableTDLSSupport) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"TDLS Disabled in INI OR not enabled in FW. "
"Cannot process TDLS commands");
return -ENOTSUPP;
@@ -4202,7 +4202,7 @@
wlan_hdd_tdls_find_peer(pAdapter, peer, true);
if (NULL == pTdlsPeer) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: peer matching " MAC_ADDRESS_STR
" not found, ignore NL80211_TDLS_ENABLE_LINK",
@@ -4210,14 +4210,14 @@
return -EINVAL;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: NL80211_TDLS_ENABLE_LINK for peer "
MAC_ADDRESS_STR " link_status: %d",
__func__, MAC_ADDR_ARRAY(peer),
pTdlsPeer->link_status);
if (!TDLS_STA_INDEX_VALID(pTdlsPeer->staId)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: invalid sta index %u for "
MAC_ADDRESS_STR
@@ -4253,7 +4253,7 @@
msecs_to_jiffies
(WAIT_TIME_TDLS_LINK_ESTABLISH_REQ));
if (!rc) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Link Establish Request timed out",
__func__);
@@ -4327,7 +4327,7 @@
CFG_TDLS_PREFERRED_OFF_CHANNEL_NUM_DEFAULT;
}
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: Peer " MAC_ADDRESS_STR
"vdevId: %d, peerState: %d, isPeerResponder: %d, uapsdQueues: 0x%x, maxSp: 0x%x, peerBuffStaSupport: %d, peerOffChanSupport: %d, peerCurrOperClass: %d, selfCurrOperClass: %d, peerChanLen: %d, peerOperClassLen: %d, prefOffChanNum: %d, prefOffChanBandwidth: %d, op_class_for_pref_off_chan: %d",
@@ -4390,7 +4390,7 @@
&smeTdlsPeerStateParams);
if (QDF_STATUS_SUCCESS !=
cdf_ret_status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: sme_update_tdls_peer_state failed for "
MAC_ADDRESS_STR,
@@ -4432,7 +4432,7 @@
wlan_hdd_tdls_find_peer(pAdapter, peer, true);
if (NULL == pTdlsPeer) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: peer matching " MAC_ADDRESS_STR
" not found, ignore NL80211_TDLS_DISABLE_LINK",
@@ -4440,7 +4440,7 @@
return -EINVAL;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: NL80211_TDLS_DISABLE_LINK for peer "
MAC_ADDRESS_STR " link_status: %d",
__func__, MAC_ADDR_ARRAY(peer),
@@ -4462,7 +4462,7 @@
msecs_to_jiffies
(WAIT_TIME_TDLS_DEL_STA));
if (!rc) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Del station timed out",
__func__);
@@ -4475,7 +4475,7 @@
eTDLS_LINK_UNSPECIFIED :
eTDLS_LINK_DROPPED_BY_REMOTE);
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: TDLS Peer Station doesn't exist.",
__func__);
@@ -4488,7 +4488,7 @@
wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer);
if (0 != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Error in TDLS Teardown",
__func__);
@@ -4502,7 +4502,7 @@
peer, NULL,
pHddCtx->config->fTDLSPrefOffChanNum, 0, 0, 0);
if (0 != status) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: Error in TDLS Setup", __func__);
return status;
@@ -4511,12 +4511,12 @@
break;
case NL80211_TDLS_DISCOVERY_REQ:
/* We don't support in-driver setup/teardown/discovery */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
"%s: We don't support in-driver setup/teardown/discovery",
__func__);
return -ENOTSUPP;
default:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: unsupported event", __func__);
return -ENOTSUPP;
}
diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c
index a5cec60..41d51fb 100644
--- a/core/hdd/src/wlan_hdd_trace.c
+++ b/core/hdd/src/wlan_hdd_trace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -35,7 +35,7 @@
*/
#include "cdf_trace.h"
-#include "cdf_types.h"
+#include "qdf_types.h"
#include "wlan_hdd_trace.h"
#include "wlan_hdd_main.h"
@@ -69,7 +69,7 @@
*/
void hdd_trace_init(void)
{
- cdf_trace_register(CDF_MODULE_ID_HDD, hdd_trace_dump);
+ cdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump);
}
#endif /* ifdef HDD_TRACE_RECORD */
diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c
index 3826d72..dc7565c 100644
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -159,7 +159,7 @@
{
if (adapter->tx_flow_timer_initialized == false) {
cdf_mc_timer_init(&adapter->tx_flow_control_timer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
timer_callback,
adapter);
adapter->tx_flow_timer_initialized = true;
@@ -242,7 +242,7 @@
ether_type = (uint16_t)(*(uint16_t *)
(skb->data + HDD_ETHERTYPE_802_1_X_FRAME_OFFSET));
- if (ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_802_1_X))
+ if (ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_802_1_X))
return true;
return false;
@@ -271,8 +271,8 @@
ether_type = (uint16_t)(*(uint16_t *)
(skb->data + HDD_ETHERTYPE_802_1_X_FRAME_OFFSET));
- if (ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_802_1_X) ||
- ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_WAI))
+ if (ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_802_1_X) ||
+ ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_WAI))
return true;
/* No error msg handled since this will happen often */
@@ -305,7 +305,7 @@
#endif /* QCA_PKT_PROTO_TRACE */
#ifdef QCA_WIFI_FTM
- if (hdd_get_conparam() == CDF_GLOBAL_FTM_MODE) {
+ if (hdd_get_conparam() == QDF_GLOBAL_FTM_MODE) {
kfree_skb(skb);
return NETDEV_TX_OK;
}
@@ -313,7 +313,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled;
if (cds_is_driver_recovering()) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
"Recovery in progress, dropping the packet");
++pAdapter->stats.tx_dropped;
++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
@@ -322,8 +322,8 @@
}
if (WLAN_HDD_IBSS == pAdapter->device_mode) {
- struct cdf_mac_addr *pDestMacAddress =
- (struct cdf_mac_addr *) skb->data;
+ struct qdf_mac_addr *pDestMacAddress =
+ (struct qdf_mac_addr *) skb->data;
if (QDF_STATUS_SUCCESS !=
hdd_ibss_get_sta_id(&pAdapter->sessionCtx.station,
@@ -334,11 +334,11 @@
(cdf_is_macaddr_broadcast(pDestMacAddress) ||
cdf_is_macaddr_group(pDestMacAddress))) {
STAId = pHddStaCtx->broadcast_ibss_staid;
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA,
CDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet",
__func__);
} else if (STAId == HDD_WLAN_INVALID_STA_ID) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
"%s: Received Unicast frame with invalid staID",
__func__);
++pAdapter->stats.tx_dropped;
@@ -350,7 +350,7 @@
if (WLAN_HDD_OCB != pAdapter->device_mode &&
eConnectionState_Associated !=
pHddStaCtx->conn_info.connState) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
FL("Tx frame in not associated state in %d context"),
pAdapter->device_mode);
++pAdapter->stats.tx_dropped;
@@ -391,7 +391,7 @@
++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL,
"%s: Classified as ac %d up %d", __func__, ac, up);
#endif /* HDD_WMM_DEBUG */
@@ -491,7 +491,7 @@
if (ol_tx_send_data_frame(STAId, (cdf_nbuf_t) skb,
proto_type) != NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
"%s: Failed to send packet to txrx for staid:%d",
__func__, STAId);
goto drop_pkt;
@@ -526,13 +526,13 @@
*/
QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx,
- struct cdf_mac_addr *pMacAddress, uint8_t *staId)
+ struct qdf_mac_addr *pMacAddress, uint8_t *staId)
{
uint8_t idx;
for (idx = 0; idx < MAX_IBSS_PEERS; idx++) {
if (cdf_mem_compare(&pHddStaCtx->conn_info.peerMacAddress[idx],
- pMacAddress, CDF_MAC_ADDR_SIZE)) {
+ pMacAddress, QDF_MAC_ADDR_SIZE)) {
*staId = pHddStaCtx->conn_info.staId[idx];
return QDF_STATUS_SUCCESS;
}
@@ -556,7 +556,7 @@
struct netdev_queue *txq;
int i = 0;
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Transmission timeout occurred jiffies %lu trans_start %lu",
__func__, jiffies, dev->trans_start);
DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_TX_TIMEOUT,
@@ -571,12 +571,12 @@
for (i = 0; i < NUM_TX_QUEUES; i++) {
txq = netdev_get_tx_queue(dev, i);
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
"Queue%d status: %d txq->trans_start %lu",
i, netif_tx_queue_stopped(txq), txq->trans_start);
}
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
"carrier state: %d", netif_carrier_ok(dev));
}
@@ -609,7 +609,7 @@
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
FL("pAdapter is NULL"));
CDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
@@ -630,7 +630,7 @@
QDF_STATUS status = QDF_STATUS_SUCCESS;
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
FL("pAdapter is NULL"));
CDF_ASSERT(0);
return QDF_STATUS_E_FAILURE;
@@ -666,14 +666,14 @@
/* Sanity check on inputs */
if ((NULL == cds_context) || (NULL == rxBuf)) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: Null params being passed", __func__);
return QDF_STATUS_E_FAILURE;
}
- pHddCtx = cds_get_context(CDF_MODULE_ID_HDD);
+ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
if (NULL == pHddCtx) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
"%s: HDD context is Null", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -690,7 +690,7 @@
skb = (struct sk_buff *)rxBuf;
if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL,
"Magic cookie(%x) for adapter sanity verification is invalid",
pAdapter->magic);
return QDF_STATUS_E_FAILURE;
@@ -700,7 +700,7 @@
if ((pHddStaCtx->conn_info.proxyARPService) &&
cfg80211_is_gratuitous_arp_unsolicited_na(skb)) {
++pAdapter->hdd_stats.hddTxRxStats.rxDropped[cpu_index];
- CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
"%s: Dropping HS 2.0 Gratuitous ARP or Unsolicited NA",
__func__);
/* Remove SKB from internal tracking table before submitting
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index ecb1fcf..f710d2d 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -510,20 +510,20 @@
* (4096 bytes). So we use 4096 as the upper boundary for now.
*/
if (len > MAX_USER_COMMAND_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Invalid length");
return NULL;
}
ptr = kmalloc(len + 1, GFP_KERNEL);
if (NULL == ptr) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"unable to allocate memory");
return NULL;
}
if (copy_from_user(ptr, wrqu_data, len)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: failed to copy data to user buffer", __func__);
kfree(ptr);
return NULL;
@@ -738,7 +738,7 @@
pHddContext = WLAN_HDD_GET_CTX(pAdapter);
if (!pHddContext) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s:Invalid context, HDD context is null", __func__);
goto error;
}
@@ -789,7 +789,7 @@
ENTER();
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Adapter is NULL", __func__);
return -EINVAL;
}
@@ -801,14 +801,14 @@
if (QDF_STATUS_SUCCESS !=
sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL
("failed to get ini parameter, WNI_CFG_RTS_THRESHOLD"));
return -EIO;
}
wrqu->rts.value = threshold;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("Rts-Threshold=%d!!"), wrqu->rts.value);
EXIT();
@@ -836,7 +836,7 @@
ENTER();
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Adapter is NULL", __func__);
return -EINVAL;
}
@@ -848,14 +848,14 @@
if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold)
!= QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL
("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD"));
return -EIO;
}
wrqu->frag.value = threshold;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("Frag-Threshold=%d!!"), wrqu->frag.value);
EXIT();
@@ -881,7 +881,7 @@
}
}
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("Invalid channel no=%d!!"), channel);
return -EINVAL;
}
@@ -1330,7 +1330,7 @@
* otherwise a CDF_STATUS_E_* error.
*/
QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter,
- struct cdf_mac_addr macAddress) {
+ struct qdf_mac_addr macAddress) {
QDF_STATUS status;
unsigned long rc;
struct linkspeedContext context;
@@ -1342,7 +1342,7 @@
}
linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req));
if (NULL == linkspeed_req) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s Request Buffer Alloc Fail", __func__);
return QDF_STATUS_E_NOMEM;
}
@@ -1419,7 +1419,7 @@
*link_speed = 0;
} else {
QDF_STATUS status;
- struct cdf_mac_addr bssid;
+ struct qdf_mac_addr bssid;
cdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId);
@@ -1962,7 +1962,7 @@
if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST,
validChan, &numChans) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL
("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST"));
return -EIO;
}
@@ -2051,7 +2051,7 @@
if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) {
if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId)
!= QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("failed to get operating channel %u"),
pAdapter->sessionId);
return -EIO;
@@ -2182,7 +2182,7 @@
if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL,
wrqu->txpower.value) != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL"));
return -EIO;
}
@@ -2390,7 +2390,7 @@
}
if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter),
WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_FIXED_RATE"));
return -EIO;
}
@@ -2456,7 +2456,7 @@
base_genie = mem_alloc_copy_from_user_helper(wrqu->data.pointer,
wrqu->data.length);
if (NULL == base_genie) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"mem_alloc_copy_from_user_helper fail");
return -ENOMEM;
}
@@ -2639,7 +2639,7 @@
status = csr_roam_get_wpa_rsn_req_ie(WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId,
&length, genIeBytes);
- length = CDF_MIN((uint16_t) length, DOT11F_IE_RSN_MAX_LEN);
+ length = QDF_MIN((uint16_t) length, DOT11F_IE_RSN_MAX_LEN);
if (wrqu->data.length < length) {
hddLog(LOG1, "%s: failed to copy data to user buffer",
__func__);
@@ -2825,7 +2825,7 @@
if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD"));
return -EIO;
}
@@ -2955,7 +2955,7 @@
if (sme_cfg_set_int
(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value)
!= QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD"));
return -EIO;
}
@@ -3129,7 +3129,7 @@
if (sme_cfg_get_int(hHal,
WNI_CFG_DOT11_MODE,
&active_phy_mode) == QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"active_phy_mode = %d", active_phy_mode);
if (active_phy_mode == WNI_CFG_DOT11_MODE_11A
@@ -3191,7 +3191,7 @@
if (sme_cfg_get_str
((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels,
&num_channels) != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL
("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST"));
return -EIO;
@@ -3771,7 +3771,7 @@
}
if (wrqu->data.flags & IW_ENCODE_DISABLED) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"****iwconfig wlan0 key off*****");
if (!fKeyPresent) {
@@ -4071,7 +4071,7 @@
(IW_ENCODE_ALG_WEP == ext->alg)) {
if (IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
("Invalid Configuration:%s"), __func__);
return -EINVAL;
} else {
@@ -4112,7 +4112,7 @@
setKey.keyDirection = eSIR_TX_RX;
cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data,
- CDF_MAC_ADDR_SIZE);
+ QDF_MAC_ADDR_SIZE);
}
/*For supplicant pae role is zero */
@@ -4179,7 +4179,7 @@
break;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d"),
__func__, (int)ext->alg, (int)ext->key_len, setKey.encType);
@@ -4206,7 +4206,7 @@
&setKey, &roamId);
if (cdf_ret_status != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"[%4d] sme_roam_set_key returned ERROR status= %d",
__LINE__, cdf_ret_status);
@@ -4265,7 +4265,7 @@
if (wrqu->retry.value < WNI_CFG_LONG_RETRY_LIMIT_STAMIN ||
wrqu->retry.value > WNI_CFG_LONG_RETRY_LIMIT_STAMAX) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
("Invalid Retry-Limit=%d!!"), wrqu->retry.value);
return -EINVAL;
@@ -4277,7 +4277,7 @@
if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT,
wrqu->retry.value) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
return -EIO;
@@ -4286,7 +4286,7 @@
if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT,
wrqu->retry.value) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
return -EIO;
@@ -4296,7 +4296,7 @@
return -EOPNOTSUPP;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("Set Retry-Limit=%d!!"), wrqu->retry.value);
EXIT();
@@ -4356,7 +4356,7 @@
if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL
("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
return -EIO;
@@ -4368,7 +4368,7 @@
if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) !=
QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL
("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
return -EIO;
@@ -4379,7 +4379,7 @@
return -EOPNOTSUPP;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"),
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"),
retry);
EXIT();
@@ -4573,7 +4573,7 @@
}
vhtchanwidth = phddctx->config->vhtChannelWidth;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d "
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d "
"ch_bond5g=%d band_24=%d band_5g=%d VHT_ch_width=%u"),
ch_bond24, ch_bond5g, band_24, band_5g, vhtchanwidth);
@@ -4808,7 +4808,7 @@
smeconfig.csrConfig.channelBondingMode5GHz;
phddctx->config->vhtChannelWidth = vhtchanwidth;
if (hdd_update_config_dat(phddctx) == false) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: could not update config_dat", __func__);
return -EIO;
}
@@ -4819,7 +4819,7 @@
phddctx->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap.cap
&= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
"New_Phymode= %d ch_bonding=%d band=%d VHT_ch_width=%u",
phymode, chwidth, curr_band, vhtchanwidth);
}
@@ -4957,7 +4957,7 @@
smeConfig.csrConfig.Is11dSupportEnabled =
(bool) set_value;
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
("11D state=%d!!"),
smeConfig.csrConfig.
@@ -5033,7 +5033,7 @@
} else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT,
set_value)
!= QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR, FL
("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT"));
ret = -EIO;
@@ -5070,7 +5070,7 @@
}
case WE_SET_TX_POWER:
{
- struct cdf_mac_addr bssid;
+ struct qdf_mac_addr bssid;
cdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId);
if (sme_set_tx_power
@@ -5085,8 +5085,8 @@
}
case WE_SET_MAX_TX_POWER:
{
- struct cdf_mac_addr bssid;
- struct cdf_mac_addr selfMac;
+ struct qdf_mac_addr bssid;
+ struct qdf_mac_addr selfMac;
hddLog(CDF_TRACE_LEVEL_INFO,
"%s: Setting maximum tx power %d dBm", __func__,
@@ -5273,7 +5273,7 @@
/* get the HT capability info */
ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value);
if (QDF_STATUS_SUCCESS != ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: could not get HT capability info",
__func__);
@@ -5292,7 +5292,7 @@
}
if (ret)
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Failed to set LDPC value");
@@ -5311,7 +5311,7 @@
/* get the HT capability info */
ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value);
if (QDF_STATUS_SUCCESS != ret) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"%s: could not get HT capability info",
__func__);
@@ -5329,7 +5329,7 @@
}
if (ret)
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Failed to set TX STBC value");
@@ -5349,7 +5349,7 @@
/* get the HT capability info */
ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value);
if (QDF_STATUS_SUCCESS != ret) {
- CDF_TRACE(CDF_MODULE_ID_CDF,
+ CDF_TRACE(QDF_MODULE_ID_QDF,
CDF_TRACE_LEVEL_ERROR,
"%s: could not get HT capability info",
__func__);
@@ -5369,7 +5369,7 @@
}
if (ret)
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Failed to set RX STBC value");
break;
@@ -5382,7 +5382,7 @@
WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
set_value);
if (ret)
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Failed to set ShortGI value");
break;
@@ -6185,7 +6185,7 @@
struct iw_point s_priv_data;
if (!capable(CAP_NET_ADMIN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("permission check failed"));
return -EPERM;
}
@@ -6212,23 +6212,23 @@
pBuffer = mem_alloc_copy_from_user_helper(s_priv_data.pointer,
s_priv_data.length);
if (NULL == pBuffer) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"mem_alloc_copy_from_user_helper fail");
return -ENOMEM;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received length %d", __func__, s_priv_data.length);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Received data %s", __func__, pBuffer);
switch (sub_cmd) {
case WE_WOWL_ADD_PTRN:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN");
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN");
hdd_add_wowl_ptrn(pAdapter, pBuffer);
break;
case WE_WOWL_DEL_PTRN:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN");
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN");
hdd_del_wowl_ptrn(pAdapter, pBuffer);
break;
#if defined WLAN_FEATURE_VOWIFI
@@ -6238,7 +6238,7 @@
tRrmNeighborRspCallbackInfo callbackInfo;
if (pConfig->fRrmEnable) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"Neighbor Request");
neighborReq.no_ssid =
@@ -6340,14 +6340,14 @@
*value = smeConfig.csrConfig.Is11dSupportEnabled;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("11D state=%d!!"), *value);
break;
}
case WE_IBSS_STATUS:
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"****Return IBSS Status*****");
break;
@@ -6362,7 +6362,7 @@
if (sme_cfg_get_int
(hHal, WNI_CFG_ASSOC_STA_LIMIT,
(uint32_t *) value) != QDF_STATUS_SUCCESS) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_WARN, FL
("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT"));
ret = -EIO;
@@ -6378,7 +6378,7 @@
{
*value = cds_get_concurrency_mode();
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
("concurrency mode=%d"), *value);
break;
}
@@ -7118,7 +7118,7 @@
case WE_GET_CFG:
{
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Printing CLD global INI Config",
__func__);
hdd_cfg_get_global_config(WLAN_HDD_GET_CTX(pAdapter),
@@ -7293,7 +7293,7 @@
phymode = sme_get_phy_mode(hal);
if ((QDF_STATUS_SUCCESS !=
sme_get_freq_band(hal, &currBand))) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_INFO,
"%s: Failed to get current band config",
__func__);
@@ -7919,9 +7919,9 @@
msg.reserved = 0;
msg.bodyptr = unitTestArgs;
if (QDF_STATUS_SUCCESS !=
- cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) {
+ cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
cdf_mem_free(unitTestArgs);
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
FL
("Not able to post UNIT_TEST_CMD message to WMA"));
@@ -7981,7 +7981,7 @@
int ret, num_args;
if (!capable(CAP_NET_ADMIN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("permission check failed"));
return -EPERM;
}
@@ -8152,7 +8152,7 @@
return 0;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"%s:TS_INFO PSB %d UP %d !!!", __func__,
tSpec.ts_info.psb, tSpec.ts_info.up);
@@ -8425,7 +8425,7 @@
return ret;
if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
"%s:LOGP dev is not in CONNECTED state, ignore!!!",
__func__);
return -EINVAL;
@@ -8745,7 +8745,7 @@
struct pkt_filter_cfg *request = NULL;
if (!capable(CAP_NET_ADMIN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("permission check failed"));
return -EPERM;
}
@@ -9282,19 +9282,19 @@
band = eCSR_BAND_MAX;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: change band to %u", __func__, band);
if (band == eCSR_BAND_MAX) {
/* Received change band request with invalid band value */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid band value %u", __func__, ui_band);
return -EINVAL;
}
if ((band == eCSR_BAND_24 && pHddCtx->config->nBandCapability == 2) ||
(band == eCSR_BAND_5G && pHddCtx->config->nBandCapability == 1)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: band value %u violate INI settings %u", __func__,
band, pHddCtx->config->nBandCapability);
return -EIO;
@@ -9308,7 +9308,7 @@
}
if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Failed to get current band config", __func__);
return -EIO;
}
@@ -9318,7 +9318,7 @@
* Abort pending scan requests, flush the existing scan results,
* and change the band capability
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Current band value = %u, new setting %u ",
__func__, currBand, band);
@@ -9388,7 +9388,7 @@
if (QDF_STATUS_SUCCESS !=
sme_set_freq_band(hHal, pAdapter->sessionId, band)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
FL("Failed to set the band value to %u"),
band);
return -EINVAL;
@@ -9423,7 +9423,7 @@
ENTER();
if (!capable(CAP_NET_ADMIN)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("permission check failed"));
return -EPERM;
}
@@ -10692,9 +10692,9 @@
};
const struct iw_handler_def we_handler_def = {
- .num_standard = CDF_ARRAY_SIZE(we_handler),
- .num_private = CDF_ARRAY_SIZE(we_private),
- .num_private_args = CDF_ARRAY_SIZE(we_private_args),
+ .num_standard = QDF_ARRAY_SIZE(we_handler),
+ .num_private = QDF_ARRAY_SIZE(we_private),
+ .num_private_args = QDF_ARRAY_SIZE(we_private_args),
.standard = (iw_handler *) we_handler,
.private = (iw_handler *) we_private,
@@ -10765,19 +10765,19 @@
if (!QDF_IS_STATUS_SUCCESS(status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
("ERROR: hdd_set_wext failed!!"));
return QDF_STATUS_E_FAILURE;
}
if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
("ERROR: HDD cdf event init failed!!"));
return QDF_STATUS_E_FAILURE;
}
if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
("ERROR: HDD scan event init failed!!"));
return QDF_STATUS_E_FAILURE;
}
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index 3cbff02..8f9dc21 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -166,7 +166,7 @@
/* The TSPEC must be valid */
if (pAc->wmmAcTspecValid == false) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invoked with invalid TSPEC", __func__);
return;
}
@@ -178,7 +178,7 @@
} else {
/* no service interval is present in the TSPEC */
/* this is OK, there just won't be U-APSD */
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: No service interval supplied", __func__);
service_interval = 0;
}
@@ -194,7 +194,7 @@
(pAc->wmmAcUapsdSuspensionInterval == suspension_interval) &&
(pAc->wmmAcUapsdDirection == direction) &&
(pAc->wmmAcIsUapsdEnabled == psb)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: No change in U-APSD parameters", __func__);
return;
}
@@ -210,7 +210,7 @@
pHddCtx->config->DelayedTriggerFrmInt);
if (!QDF_IS_STATUS_SUCCESS(status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to enable U-APSD for AC=%d",
__func__, acType);
return;
@@ -222,7 +222,7 @@
pAc->wmmAcUapsdDirection = direction;
pAc->wmmAcIsUapsdEnabled = psb;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Enabled UAPSD in TL srv_int=%d "
"susp_int=%d dir=%d AC=%d",
__func__,
@@ -255,13 +255,13 @@
acType, pAdapter->sessionId);
if (!QDF_IS_STATUS_SUCCESS(status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Failed to disable U-APSD for AC=%d",
__func__, acType);
} else {
/* TL no longer has valid UAPSD info */
pAc->wmmAcUapsdInfoValid = false;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Disabled UAPSD in TL for AC=%d",
__func__, acType);
}
@@ -281,7 +281,7 @@
{
hdd_adapter_t *pAdapter;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p", __func__, pQosContext);
if (unlikely((NULL == pQosContext) ||
@@ -325,12 +325,12 @@
union iwreq_data wrqu;
char buf[MAX_NOTIFY_LEN + 1];
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p", __func__, pQosContext);
if (unlikely((NULL == pQosContext) ||
(HDD_WMM_CTX_MAGIC != pQosContext->magic))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid QoS Context", __func__);
return;
}
@@ -350,7 +350,7 @@
pAdapter = pQosContext->pAdapter;
/* send the event */
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Sending [%s]", __func__, buf);
wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf);
}
@@ -388,7 +388,7 @@
pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext->
acType];
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL(
"WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d"
),
@@ -396,7 +396,7 @@
if (pAc->wmmPrevTrafficCnt == currentTrafficCnt) {
/* there is no traffic activity, delete the TSPEC for this AC */
status = hdd_wmm_delts(pAdapter, pQosContext->handle);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
FL(
"Deleted TS on AC %d, due to inactivity with status = %d!!!"
),
@@ -409,7 +409,7 @@
cdf_mc_timer_start(&pAc->wmmInactivityTimer,
pAc->wmmInactivityTime);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
FL(
"Restarting inactivity timer failed on AC %d"
@@ -452,11 +452,11 @@
pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
qdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer,
- CDF_TIMER_TYPE_SW,
+ QDF_TIMER_TYPE_SW,
hdd_wmm_inactivity_timer_cb,
pQosContext);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Initializing inactivity timer failed on AC %d"),
acType);
return qdf_status;
@@ -465,7 +465,7 @@
qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer,
inactivityTime);
if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
FL("Starting inactivity timer failed on AC %d"),
acType);
qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer);
@@ -549,12 +549,12 @@
sme_ac_enum_type acType;
hdd_wmm_ac_status_t *pAc;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p", __func__, pQosContext);
if (unlikely((NULL == pQosContext) ||
(HDD_WMM_CTX_MAGIC != pQosContext->magic))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid QoS Context", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -563,14 +563,14 @@
acType = pQosContext->acType;
pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: status %d flowid %d info %p",
__func__, smeStatus, qosFlowId, pCurrentQosInfo);
switch (smeStatus) {
case SME_QOS_STATUS_SETUP_SUCCESS_IND:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Setup is complete", __func__);
/* there will always be a TSPEC returned with this
@@ -588,7 +588,7 @@
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -601,7 +601,7 @@
#ifdef FEATURE_WLAN_ESE
/* Check if the inactivity interval is specified */
if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Inactivity timer value = %d for AC=%d",
__func__,
pCurrentQosInfo->inactivity_interval, acType);
@@ -617,7 +617,7 @@
break;
case SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setup is complete (U-APSD set previously)",
__func__);
@@ -627,7 +627,7 @@
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -640,7 +640,7 @@
break;
case SME_QOS_STATUS_SETUP_FAILURE_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup failed", __func__);
/* QoS setup failed */
@@ -649,7 +649,7 @@
pAc->wmmAcAccessAllowed = false;
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -672,7 +672,7 @@
break;
case SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup Invalid Params, notify TL", __func__);
/* QoS setup failed */
pAc->wmmAcAccessAllowed = false;
@@ -689,7 +689,7 @@
pAc->wmmAcAccessAllowed = true;
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -701,10 +701,10 @@
break;
case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup failed, not a QoS AP", __func__);
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -716,13 +716,13 @@
break;
case SME_QOS_STATUS_SETUP_REQ_PENDING_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setup pending", __func__);
/* not a callback status -- ignore if we get it */
break;
case SME_QOS_STATUS_SETUP_MODIFIED_IND:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setup modified", __func__);
if (pCurrentQosInfo) {
/* update the TSPEC */
@@ -731,7 +731,7 @@
pCurrentQosInfo, sizeof(pAc->wmmAcTspecInfo));
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -757,7 +757,7 @@
pAc->wmmAcAccessAllowed = true;
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -773,7 +773,7 @@
break;
case SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Setup successful but U-APSD failed", __func__);
if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle) {
@@ -789,7 +789,7 @@
pAc->wmmAcAccessPending = false;
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -807,11 +807,11 @@
break;
case SME_QOS_STATUS_RELEASE_SUCCESS_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Release is complete", __func__);
if (pCurrentQosInfo) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: flows still active", __func__);
/* there is still at least one flow active for
@@ -823,7 +823,7 @@
/* need to tell TL to update its UAPSD handling */
hdd_wmm_enable_tl_uapsd(pQosContext);
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: last flow", __func__);
/* this is the last flow active for this AC so
@@ -839,7 +839,7 @@
}
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -853,14 +853,14 @@
break;
case SME_QOS_STATUS_RELEASE_FAILURE_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Release failure", __func__);
/* we don't need to update our state or TL since
* nothing has changed
*/
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -873,7 +873,7 @@
break;
case SME_QOS_STATUS_RELEASE_QOS_LOST_IND:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: QOS Lost indication received", __func__);
/* current TSPEC is no longer valid */
@@ -889,7 +889,7 @@
pAc->wmmAcAccessGranted = false;
pAc->wmmAcAccessFailed = false;
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Explicit Qos, notifying user space",
__func__);
@@ -903,13 +903,13 @@
break;
case SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Release pending", __func__);
/* not a callback status -- ignore if we get it */
break;
case SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Release Invalid Params", __func__);
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
/* this was triggered by an application */
@@ -920,7 +920,7 @@
break;
case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Modification is complete, notify TL", __func__);
/* there will always be a TSPEC returned with this
@@ -966,7 +966,7 @@
break;
case SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: modification pending", __func__);
/* not a callback status -- ignore if we get it */
break;
@@ -999,7 +999,7 @@
break;
case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Modify successful but U-APSD failed", __func__);
/* QoS modification was successful but setting U=APSD
@@ -1035,7 +1035,7 @@
break;
default:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d", __func__, smeStatus);
CDF_ASSERT(0);
}
@@ -1055,7 +1055,7 @@
pAc->wmmAcAccessAllowed = true;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: complete, access for TL AC %d is%sallowed",
__func__, acType, pAc->wmmAcAccessAllowed ? " " : " not ");
@@ -1074,12 +1074,12 @@
int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr)
{
if (NULL == pAdapter) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: pAdapter is NULL", __func__);
return -EINVAL;
}
if (NULL == ptr) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: ptr is NULL", __func__);
return -EINVAL;
}
@@ -1110,11 +1110,11 @@
sme_QosWmmTspecInfo qosInfo;
hdd_context_t *hdd_ctx;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered, context %p", __func__, pQosContext);
if (unlikely(HDD_WMM_CTX_MAGIC != pQosContext->magic)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid QoS Context", __func__);
return;
}
@@ -1130,11 +1130,11 @@
acType = pQosContext->acType;
pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: pAdapter %p acType %d", __func__, pAdapter, acType);
if (!pAc->wmmAcAccessNeeded) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: AC %d doesn't need service", __func__, acType);
pQosContext->magic = 0;
kfree(pQosContext);
@@ -1298,7 +1298,7 @@
qosInfo.ts_info.up,
&pQosContext->qosFlowId);
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: sme_qos_setup_req returned %d flowid %d",
__func__, smeStatus, pQosContext->qosFlowId);
@@ -1309,7 +1309,7 @@
/* setup is pending, so no more work to do now. all
* further work will be done in hdd_wmm_sme_callback()
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Setup is pending, no further work", __func__);
break;
@@ -1332,7 +1332,7 @@
/* for these cases everything is already setup so we
* can signal TL that it has work to do
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Setup is complete, notify TL", __func__);
pAc->wmmAcAccessAllowed = true;
@@ -1342,7 +1342,7 @@
break;
default:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d", __func__, smeStatus);
CDF_ASSERT(0);
}
@@ -1378,7 +1378,7 @@
sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap;
uint8_t dscp;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
/* DSCP to User Priority Lookup Table
@@ -1409,7 +1409,7 @@
hdd_wmm_ac_status_t *pAcStatus;
sme_ac_enum_type acType;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
pAdapter->hddWmmStatus.wmmQap = false;
@@ -1447,7 +1447,7 @@
{
hdd_wmm_ac_status_t *pAcStatus;
sme_ac_enum_type acType;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
for (acType = 0; acType < WLAN_MAX_AC; acType++) {
pAcStatus = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
@@ -1476,7 +1476,7 @@
{
hdd_wmm_qos_context_t *pQosContext;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
/* free any context records that we still have linked */
@@ -1526,7 +1526,7 @@
*/
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
#endif /* HDD_WMM_DEBUG */
@@ -1534,7 +1534,7 @@
eth_hdr = (union generic_ethhdr *)pkt;
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: proto is 0x%04x", __func__, skb->protocol);
#endif /* HDD_WMM_DEBUG */
@@ -1543,7 +1543,7 @@
ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_II)];
tos = ip_hdr->tos;
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Ethernet II IP Packet, tos is %d",
__func__, tos);
#endif /* HDD_WMM_DEBUG */
@@ -1552,7 +1552,7 @@
ipv6hdr = ipv6_hdr(skb);
tos = ntohs(*(const __be16 *)ipv6hdr) >> 4;
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Ethernet II IPv6 Packet, tos is %d",
__func__, tos);
#endif /* HDD_WMM_DEBUG */
@@ -1565,7 +1565,7 @@
ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_8023)];
tos = ip_hdr->tos;
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: 802.3 LLC/SNAP IP Packet, tos is %d",
__func__, tos);
#endif /* HDD_WMM_DEBUG */
@@ -1580,7 +1580,7 @@
&pkt[sizeof(eth_hdr->eth_IIv)];
tos = ip_hdr->tos;
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
WMM_TRACE_LEVEL_INFO_LOW,
"%s: Ethernet II VLAN tagged IP Packet, tos is %d",
__func__, tos);
@@ -1602,7 +1602,7 @@
&pkt[sizeof(eth_hdr->eth_8023v)];
tos = ip_hdr->tos;
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
WMM_TRACE_LEVEL_INFO_LOW,
"%s: 802.3 LLC/SNAP VLAN tagged IP Packet, tos is %d",
__func__, tos);
@@ -1610,7 +1610,7 @@
} else {
/* default */
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
WMM_TRACE_LEVEL_WARN,
"%s: VLAN tagged Unhandled Protocol, using default tos",
__func__);
@@ -1620,7 +1620,7 @@
} else {
/* default */
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
"%s: Unhandled Protocol, using default tos",
__func__);
#endif /* HDD_WMM_DEBUG */
@@ -1637,7 +1637,7 @@
*user_pri = adapter->hddWmmDscpToUpMap[dscp];
#ifdef HDD_WMM_DEBUG
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: tos is %d, dscp is %d, up is %d",
__func__, tos, dscp, *user_pri);
#endif /* HDD_WMM_DEBUG */
@@ -1777,7 +1777,7 @@
pAdapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK;
break;
default:
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Invalid AC Type", __func__);
break;
}
@@ -1799,7 +1799,7 @@
{
hdd_wmm_qos_context_t *pQosContext;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered for AC %d", __func__, acType);
if (!hdd_wmm_is_active(pAdapter) ||
@@ -1808,7 +1808,7 @@
/* either we don't want QoS or the AP doesn't support
* QoS or we don't want to do implicit QoS
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: QoS not configured on both ends ", __func__);
*pGranted =
@@ -1823,7 +1823,7 @@
/* request already pending so we need to wait for that
* response
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Implicit QoS for TL AC %d already scheduled",
__func__, acType);
@@ -1838,7 +1838,7 @@
/* request previously failed
* allow access, but we'll be downgraded
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Implicit QoS for TL AC %d previously failed",
__func__, acType);
@@ -1856,7 +1856,7 @@
return QDF_STATUS_SUCCESS;
}
/* we need to establish implicit QoS */
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p",
__func__, acType, pAdapter);
@@ -1867,7 +1867,7 @@
/* no memory for QoS context. Nothing we can do but
* let data flow
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Unable to allocate context", __func__);
pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed =
true;
@@ -1889,7 +1889,7 @@
INIT_WORK(&pQosContext->wmmAcSetupImplicitQos, hdd_wmm_do_implicit_qos);
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Scheduling work for AC %d, context %p",
__func__, acType, pQosContext);
@@ -1923,7 +1923,7 @@
* enable UAPSD for any access categories
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
if (pRoamInfo->fReassocReq) {
@@ -1936,7 +1936,7 @@
* parameters will be updated there
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Reassoc so no work, Exiting", __func__);
return QDF_STATUS_SUCCESS;
@@ -1945,7 +1945,7 @@
uapsdMask =
pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: U-APSD mask is 0x%02x", __func__, (int)uapsdMask);
if (uapsdMask & HDD_AC_VO) {
@@ -2020,7 +2020,7 @@
hdd_wmm_init(pAdapter);
}
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Exiting", __func__);
return QDF_STATUS_SUCCESS;
@@ -2051,7 +2051,7 @@
bool qosConnection;
uint8_t acmMask;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered", __func__);
if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) &&
@@ -2065,7 +2065,7 @@
acmMask = 0x0;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: qap is %d, qosConnection is %d, acmMask is 0x%x",
__func__, qap, qosConnection, acmMask);
@@ -2074,7 +2074,7 @@
for (ac = 0; ac < WLAN_MAX_AC; ac++) {
if (qap && qosConnection && (acmMask & acm_mask_bit[ac])) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: ac %d on", __func__, ac);
/* admission is required */
@@ -2094,7 +2094,7 @@
wmmAcAccessAllowed = true;
}
} else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: ac %d off", __func__, ac);
/* admission is not required so access is allowed */
pAdapter->hddWmmStatus.wmmAcStatus[ac].
@@ -2105,7 +2105,7 @@
}
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Exiting", __func__);
return QDF_STATUS_SUCCESS;
@@ -2199,7 +2199,7 @@
#endif
bool found = false;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered with handle 0x%x", __func__, handle);
/* see if a context already exists with the given handle */
@@ -2214,7 +2214,7 @@
mutex_unlock(&pAdapter->hddWmmStatus.wmmLock);
if (found) {
/* record with that handle already exists */
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Record already exists with handle 0x%x",
__func__, handle);
@@ -2250,7 +2250,7 @@
/* we didn't get back one of the
* SME_QOS_STATUS_MODIFY_* status codes
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d", __func__,
smeStatus);
CDF_ASSERT(0);
@@ -2269,7 +2269,7 @@
pQosContext = kmalloc(sizeof(*pQosContext), GFP_KERNEL);
if (NULL == pQosContext) {
/* no memory for QoS context. Nothing we can do */
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: Unable to allocate QoS context", __func__);
return HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE;
}
@@ -2279,7 +2279,7 @@
if (pTspec->ts_info.up < HDD_WMM_UP_TO_AC_MAP_SIZE)
pQosContext->acType = hdd_wmm_up_to_ac_map[pTspec->ts_info.up];
else {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: ts_info.up (%d) larger than max value (%d), use default acType (%d)",
__func__, pTspec->ts_info.up,
HDD_WMM_UP_TO_AC_MAP_SIZE - 1, hdd_wmm_up_to_ac_map[0]);
@@ -2289,7 +2289,7 @@
pQosContext->qosFlowId = 0;
pQosContext->magic = HDD_WMM_CTX_MAGIC;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: Setting up QoS, context %p", __func__, pQosContext);
mutex_lock(&pAdapter->hddWmmStatus.wmmLock);
@@ -2305,7 +2305,7 @@
pTspec->ts_info.up,
&pQosContext->qosFlowId);
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
"%s: sme_qos_setup_req returned %d flowid %d",
__func__, smeStatus, pQosContext->qosFlowId);
@@ -2342,7 +2342,7 @@
* SME_QOS_STATUS_SETUP_* status codes
*/
hdd_wmm_free_context(pQosContext);
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d", __func__, smeStatus);
CDF_ASSERT(0);
return HDD_WLAN_WMM_STATUS_SETUP_FAILED;
@@ -2378,7 +2378,7 @@
sme_QosStatusType smeStatus;
#endif
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered with handle 0x%x", __func__, handle);
/* locate the context with the given handle */
@@ -2396,12 +2396,12 @@
if (false == found) {
/* we didn't find the handle */
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: handle 0x%x not found", __func__, handle);
return HDD_WLAN_WMM_STATUS_RELEASE_FAILED_BAD_PARAM;
}
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: found handle 0x%x, flow %d, AC %d, context %p",
__func__, handle, qosFlowId, acType, pQosContext);
@@ -2409,7 +2409,7 @@
smeStatus =
sme_qos_release_req(WLAN_HDD_GET_HAL_CTX(pAdapter), qosFlowId);
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: SME flow %d released, SME status %d",
__func__, qosFlowId, smeStatus);
@@ -2455,7 +2455,7 @@
/* we didn't get back one of the
* SME_QOS_STATUS_RELEASE_* status codes
*/
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
"%s: unexpected SME Status=%d", __func__, smeStatus);
CDF_ASSERT(0);
status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED;
@@ -2484,7 +2484,7 @@
hdd_wmm_qos_context_t *pQosContext;
hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST;
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: Entered with handle 0x%x", __func__, handle);
/* locate the context with the given handle */
@@ -2492,7 +2492,7 @@
list_for_each_entry(pQosContext,
&pAdapter->hddWmmStatus.wmmContextList, node) {
if (pQosContext->handle == handle) {
- CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+ CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
"%s: found handle 0x%x, context %p",
__func__, handle, pQosContext);
diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c
index fc1992a..def8b33 100644
--- a/core/hdd/src/wlan_hdd_wowl.c
+++ b/core/hdd/src/wlan_hdd_wowl.c
@@ -59,7 +59,7 @@
static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status)
{
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Return code = (%d)", __func__, cdf_ret_status);
}
@@ -67,7 +67,7 @@
static void hdd_wowl_wake_indication_callback(void *pContext,
tpSirWakeReasonInd wake_reason_ind)
{
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d",
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d",
__func__, wake_reason_ind->ulReason);
hdd_exit_wowl((hdd_adapter_t *) pContext);
}
@@ -83,25 +83,25 @@
{
int i;
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Patetrn Id = 0x%x", __func__, ptrn->pattern_id);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: Pattern Byte Offset = 0x%x", __func__,
ptrn->pattern_byte_offset);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: pattern_size = 0x%x", __func__, ptrn->pattern_size);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
"%s: pattern_mask_size = 0x%x", __func__,
ptrn->pattern_mask_size);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ",
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ",
__func__);
for (i = 0; i < ptrn->pattern_size; i++)
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X",
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X",
ptrn->pattern[i]);
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ",
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ",
__func__);
for (i = 0; i < ptrn->pattern_mask_size; i++)
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X",
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X",
ptrn->pattern_mask[i]);
}
@@ -139,7 +139,7 @@
/* Pattern Already configured, skip to
* next pattern
*/
- CDF_TRACE(CDF_MODULE_ID_HDD,
+ CDF_TRACE(QDF_MODULE_ID_HDD,
CDF_TRACE_LEVEL_ERROR,
"Trying to add duplicate WoWL pattern. Skip it!");
ptrn += len;
@@ -159,7 +159,7 @@
/* Maximum number of patterns have been configured already */
if (first_empty_slot == -1) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Cannot add anymore patterns. No free slot!",
__func__);
return false;
@@ -167,7 +167,7 @@
/* Validate the pattern */
if (ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER ||
ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Malformed pattern string. Skip!",
__func__);
ptrn += len;
@@ -186,7 +186,7 @@
if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE
|| localPattern.pattern_mask_size >
WOWL_PTRN_MASK_MAX_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Invalid length specified. Skip!",
__func__);
ptrn += len;
@@ -196,7 +196,7 @@
offset = 5 + 2 * localPattern.pattern_size + 1;
if ((offset >= len) ||
(ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Malformed pattern string..skip!",
__func__);
ptrn += len;
@@ -206,7 +206,7 @@
offset = offset + 2 * localPattern.pattern_mask_size;
if (offset + 1 != len) {
/* offset begins with 0 */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Malformed pattern string...skip!",
__func__);
ptrn += len;
@@ -241,7 +241,7 @@
g_hdd_wowl_ptrns[first_empty_slot] =
kmalloc(len + 1, GFP_KERNEL);
if (g_hdd_wowl_ptrns[first_empty_slot] == NULL) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: kmalloc failure", __func__);
return false;
}
@@ -258,7 +258,7 @@
sessionId);
if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
/* Add failed, so invalidate the local storage */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"sme_wowl_add_bcast_pattern failed with error code (%d)",
cdf_ret_status);
kfree(g_hdd_wowl_ptrns[first_empty_slot]);
@@ -316,7 +316,7 @@
sessionId);
if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
/* Remove from local storage as well */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"Deleted pattern with id %d [%s]", id,
g_hdd_wowl_ptrns[id]);
@@ -350,7 +350,7 @@
uint16_t pattern_len, mask_len, i;
if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: WoW pattern index %d is out of range (0 ~ %d).",
__func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1);
@@ -361,7 +361,7 @@
/* Since the pattern is a hex string, 2 characters represent 1 byte. */
if (pattern_len % 2) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Malformed WoW pattern!", __func__);
return false;
@@ -369,7 +369,7 @@
pattern_len >>= 1;
if (!pattern_len || pattern_len > WOWL_PTRN_MAX_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: WoW pattern length %d is out of range (1 ~ %d).",
__func__, pattern_len, WOWL_PTRN_MAX_SIZE);
@@ -382,7 +382,7 @@
localPattern.session_id = session_id;
if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: WoW pattern size (%d) greater than max (%d)",
__func__, localPattern.pattern_size,
SIR_WOWL_BCAST_PATTERN_MAX_SIZE);
@@ -406,13 +406,13 @@
mask_len = strlen(pattern_mask);
if ((mask_len % 2)
|| (localPattern.pattern_mask_size != (mask_len >> 1))) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: Malformed WoW pattern mask!", __func__);
return false;
}
if (localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: WoW pattern mask size (%d) greater than max (%d)",
__func__, localPattern.pattern_mask_size,
WOWL_PTRN_MASK_MAX_SIZE);
@@ -433,7 +433,7 @@
sme_wow_add_pattern(hHal, &localPattern, session_id);
if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: sme_wowl_add_bcast_pattern failed with error code (%d).",
__func__, cdf_ret_status);
@@ -467,7 +467,7 @@
uint8_t sessionId = pAdapter->sessionId;
if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: WoW pattern index %d is not in the range (0 ~ %d).",
__func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1);
@@ -475,7 +475,7 @@
}
if (!g_hdd_wowl_ptrns_debugfs[pattern_idx]) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: WoW pattern %d is not in the table.",
__func__, pattern_idx);
@@ -488,7 +488,7 @@
sessionId);
if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"%s: sme_wowl_del_bcast_pattern failed with error code (%d).",
__func__, cdf_ret_status);
@@ -544,7 +544,7 @@
if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
if (QDF_STATUS_PMC_PENDING != cdf_ret_status) {
/* We failed to enter WoWL */
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"sme_enter_wowl failed with error code (%d)",
cdf_ret_status);
return false;
@@ -569,7 +569,7 @@
cdf_ret_status = sme_exit_wowl(hHal, &wowParams);
if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
- CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
"sme_exit_wowl failed with error code (%d)",
cdf_ret_status);
return false;