summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanumantha Reddy Pothula <c_hpothu@qti.qualcomm.com>2015-08-18 11:04:44 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2015-08-19 04:02:12 -0700
commit465004601eae299d2f826deed4ee1c95d2d4b3a9 (patch)
tree01b0c2d5e102fe5500ea1296e4a082ff0daf0018
parent06c44fc1a1aaba57c6f9bf955aba4e44b4cf1195 (diff)
qcacld-2.0: wlan: Cleanup North-Bound load/unload logs
prima to qcacld-2.0 propagation If IOCTLs or CFG callbacks are issued continiously during driver load/unload or during SSR, observing stability issues because of excessive logging. Hence move log level to INFO from ERROR in wlan_hdd_validate_context function and don't print return status in its caller functions. Change-Id: I8fd9b25e0c774e1e12b01128eb86783c9dec2ab7 CRs-Fixed: 800631
Diffstat
-rw-r--r--CORE/HDD/src/wlan_hdd_assoc.c8
-rw-r--r--CORE/HDD/src/wlan_hdd_cfg80211.c430
-rw-r--r--CORE/HDD/src/wlan_hdd_debugfs.c14
-rw-r--r--CORE/HDD/src/wlan_hdd_early_suspend.c25
-rw-r--r--CORE/HDD/src/wlan_hdd_hostapd.c76
-rwxr-xr-xCORE/HDD/src/wlan_hdd_main.c13
-rw-r--r--CORE/HDD/src/wlan_hdd_oemdata.c11
-rw-r--r--CORE/HDD/src/wlan_hdd_p2p.c43
-rw-r--r--CORE/HDD/src/wlan_hdd_scan.c10
-rw-r--r--CORE/HDD/src/wlan_hdd_tdls.c87
-rw-r--r--CORE/HDD/src/wlan_hdd_tx_rx.c7
-rw-r--r--CORE/HDD/src/wlan_hdd_wext.c77
12 files changed, 360 insertions, 441 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index f7c28ceddb70..8d883f78affd 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -3234,6 +3234,8 @@ static void iw_full_power_cbfn (void *pContext, eHalStatus status)
hdd_context_t *pHddCtx = NULL;
int ret;
+ ENTER();
+
if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
{
hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -3245,16 +3247,13 @@ static void iw_full_power_cbfn (void *pContext, eHalStatus status)
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
if (0 != ret)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid (%d)", __func__, ret);
return;
- }
if (pHddCtx->cfg_ini->fIsBmpsEnabled)
{
sme_RequestBmps(WLAN_HDD_GET_HAL_CTX(pAdapter), NULL, NULL);
}
+ EXIT();
}
#ifdef WLAN_FEATURE_11W
@@ -4637,6 +4636,7 @@ static int __iw_get_essid(struct net_device *dev,
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_wext_state_t *wextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+
ENTER();
if((pHddStaCtx->conn_info.connState == eConnectionState_Associated &&
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 685e4c36126a..4cd1d9a17fa8 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1427,11 +1427,11 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy,
return -EINVAL;
}
+ ENTER();
+
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(LOGE, FL("Hdd context not valid"));
+ if (0 != ret)
return -EINVAL;
- }
if (wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) {
hddLog(LOG1, FL("Infra Station mode is supported by driver"));
@@ -1526,7 +1526,9 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy,
goto nla_put_failure;
}
- return cfg80211_vendor_cmd_reply(skb);
+ ret = cfg80211_vendor_cmd_reply(skb);
+ EXIT();
+ return ret;
nla_put_failure:
kfree_skb(skb);
@@ -1687,10 +1689,8 @@ __wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
}
ret = wlan_hdd_validate_context(hdd_ctx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_MAX,
data, data_len, NULL)) {
@@ -1737,7 +1737,9 @@ __wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy,
return -EINVAL;
}
- return cfg80211_vendor_cmd_reply(reply_skb);
+ ret = cfg80211_vendor_cmd_reply(reply_skb);
+ EXIT();
+ return ret;
}
hddLog(LOGE, FL("Feature set matrix: buffer alloc fail"));
return -ENOMEM;
@@ -2401,10 +2403,8 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
}
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != ret)
return -EINVAL;
- }
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
data, data_len,
@@ -2457,6 +2457,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
if (ret)
hddLog(LOGE, FL("Failed to send ext scan capability to user space"));
+ EXIT();
return ret;
fail:
@@ -2541,10 +2542,8 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return -EINVAL;
- }
if (nla_parse(tb, PARAM_MAX, data, data_len,
wlan_hdd_extscan_config_policy)) {
@@ -2604,7 +2603,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
retval = context->response_status;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -2680,10 +2679,8 @@ static int __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return -EINVAL;
- }
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
data, data_len,
@@ -2798,7 +2795,7 @@ static int __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
retval = -EINVAL;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -3099,10 +3096,8 @@ static int __wlan_hdd_cfg80211_extscan_set_significant_change(
}
retval = wlan_hdd_validate_context(pHddCtx);
- if (0 != retval) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != retval)
return -EINVAL;
- }
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
data, data_len,
@@ -3239,7 +3234,7 @@ static int __wlan_hdd_cfg80211_extscan_set_significant_change(
retval = -EINVAL;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -3297,10 +3292,8 @@ static int __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
}
retval = wlan_hdd_validate_context(pHddCtx);
- if (0 != retval) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != retval)
return -EINVAL;
- }
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
data, data_len,
@@ -3388,7 +3381,9 @@ static int __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
return -EINVAL;
}
- return cfg80211_vendor_cmd_reply(reply_skb);
+ retval = cfg80211_vendor_cmd_reply(reply_skb);
+ EXIT();
+ return retval;
}
hddLog(LOGE, FL("valid channels: buffer alloc fail"));
return -EINVAL;
@@ -3964,10 +3959,8 @@ static int __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
}
retval = wlan_hdd_validate_context(pHddCtx);
- if (0 != retval) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != retval)
return -EINVAL;
- }
if (nla_parse(tb, PARAM_MAX, data, data_len,
wlan_hdd_extscan_config_policy)) {
@@ -4088,7 +4081,7 @@ static int __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
retval = -EINVAL;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -4172,10 +4165,8 @@ static int __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
}
retval = wlan_hdd_validate_context(pHddCtx);
- if (0 != retval) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != retval)
return -EINVAL;
- }
if (nla_parse(tb, PARAM_MAX, data, data_len,
wlan_hdd_extscan_config_policy)) {
@@ -4228,7 +4219,7 @@ static int __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
retval = -EINVAL;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -4289,10 +4280,8 @@ static int __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
}
retval = wlan_hdd_validate_context(pHddCtx);
- if (0 != retval) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != retval)
return -EINVAL;
- }
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
data, data_len,
@@ -4346,7 +4335,7 @@ static int __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
retval = -EINVAL;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -4546,11 +4535,8 @@ static int __wlan_hdd_cfg80211_extscan_reset_significant_change(
}
retval = wlan_hdd_validate_context(pHddCtx);
- if (0 != retval) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != retval)
return -EINVAL;
- }
-
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX,
data, data_len,
@@ -4605,7 +4591,7 @@ static int __wlan_hdd_cfg80211_extscan_reset_significant_change(
retval = -EINVAL;
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return retval;
fail:
@@ -5653,15 +5639,12 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter,
struct nlattr *peers;
int numRate;
- pWifiPeerStat = pData;
+ ENTER();
+ pWifiPeerStat = pData;
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
return;
- }
hddLog(VOS_TRACE_LEVEL_INFO,
"LL_STATS_PEER_ALL : numPeers %u, more data = %u",
@@ -5809,7 +5792,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter,
nla_nest_end(vendor_event, peerInfo);
}
cfg80211_vendor_cmd_reply(vendor_event);
- return;
+ EXIT();
}
/*
@@ -5828,15 +5811,12 @@ static void hdd_link_layer_process_iface_stats(hdd_adapter_t *pAdapter,
int status;
int i;
- pWifiIfaceStat = pData;
+ ENTER();
+ pWifiIfaceStat = pData;
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid") );
return;
- }
/*
* Allocate a size of 4096 for the interface stats comprising
@@ -5962,7 +5942,7 @@ static void hdd_link_layer_process_iface_stats(hdd_adapter_t *pAdapter,
}
cfg80211_vendor_cmd_reply(vendor_event);
- return;
+ EXIT();
}
/*
@@ -5982,14 +5962,12 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter,
struct sk_buff *vendor_event;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
+
pWifiRadioStat = pData;
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
return;
- }
hddLog(VOS_TRACE_LEVEL_INFO,
"LL_STATS_RADIO"
@@ -6152,7 +6130,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter,
nla_nest_end(vendor_event, chList);
}
cfg80211_vendor_cmd_reply(vendor_event);
- return;
+ EXIT();
}
/*
@@ -6335,13 +6313,11 @@ static int __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
return -EINVAL;
}
+ ENTER();
+
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
return -EINVAL;
- }
if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_MAX,
(struct nlattr *)data,
@@ -6401,6 +6377,7 @@ static int __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
pAdapter->isLinkLayerStatsSet = 1;
+ EXIT();
return 0;
}
@@ -6463,13 +6440,11 @@ static int __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
return -EINVAL;
}
+ ENTER();
+
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
return -EINVAL ;
- }
if (!pAdapter->isLinkLayerStatsSet)
{
@@ -6541,7 +6516,7 @@ static int __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
context->request_id, context->request_bitmap);
return -ETIMEDOUT;
}
-
+ EXIT();
return 0;
}
@@ -6598,13 +6573,11 @@ static int __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
return -EINVAL;
}
+ ENTER();
+
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
return -EINVAL;
- }
if (!pAdapter->isLinkLayerStatsSet)
{
@@ -6687,9 +6660,9 @@ static int __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
return cfg80211_vendor_cmd_reply(temp_skbuff);
}
+ EXIT();
return -ENOMEM;
}
-
return -EINVAL;
}
@@ -7161,10 +7134,11 @@ static int __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy,
return -EINVAL;
}
+ ENTER();
+
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
+ if (0 != ret)
return -EINVAL;
- }
if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
return -ENOTSUPP;
}
@@ -7226,7 +7200,9 @@ static int __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy,
goto nla_put_failure;
}
- return cfg80211_vendor_cmd_reply(skb);
+ ret = cfg80211_vendor_cmd_reply(skb);
+ EXIT();
+ return ret;
nla_put_failure:
kfree_skb(skb);
@@ -7268,10 +7244,10 @@ static int wlan_hdd_cfg80211_exttdls_callback(const tANI_U8* mac,
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
struct sk_buff *skb = NULL;
- if (wlan_hdd_validate_context(pHddCtx)) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid "));
+ ENTER();
+
+ if (wlan_hdd_validate_context(pHddCtx))
return -EINVAL;
- }
if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
return -ENOTSUPP;
@@ -7316,6 +7292,7 @@ static int wlan_hdd_cfg80211_exttdls_callback(const tANI_U8* mac,
}
cfg80211_vendor_event(skb, GFP_KERNEL);
+ EXIT();
return (0);
nla_put_failure:
@@ -7335,6 +7312,9 @@ static int __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy,
struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX + 1];
eHalStatus status;
tdls_req_params_t pReqMsg = {0};
+ int ret;
+
+ ENTER();
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -7342,11 +7322,8 @@ static int __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
+ if (0 != status)
return -EINVAL;
- }
if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
hddLog(VOS_TRACE_LEVEL_ERROR,
FL("TDLS External Control is not enabled"));
@@ -7410,13 +7387,15 @@ static int __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy,
hddLog(VOS_TRACE_LEVEL_INFO, FL("Bandwidth (%d)"),
pReqMsg.min_bandwidth_kbps);
- return (wlan_hdd_tdls_extctrl_config_peer(pAdapter,
+ ret = wlan_hdd_tdls_extctrl_config_peer(pAdapter,
peer,
wlan_hdd_cfg80211_exttdls_callback,
pReqMsg.channel,
pReqMsg.max_latency_ms,
pReqMsg.global_operating_class,
- pReqMsg.min_bandwidth_kbps));
+ pReqMsg.min_bandwidth_kbps);
+ EXIT();
+ return ret;
}
/**
@@ -7460,11 +7439,8 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR,
- FL("HDD context is not valid"));
+ if (0 != status)
return -EINVAL;
- }
if (pHddCtx->cfg_ini->fTDLSExternalControl == FALSE) {
return -ENOTSUPP;
@@ -7486,7 +7462,9 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
sizeof(peer));
hddLog(VOS_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR),MAC_ADDR_ARRAY(peer));
- return (wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer));
+ status = wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer);
+ EXIT();
+ return status;
}
/**
@@ -11211,11 +11189,7 @@ __wlan_hdd_cfg80211_set_channel(struct wiphy *wiphy,
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
/*
* Do freq to chan conversion
@@ -12151,10 +12125,8 @@ static int __wlan_hdd_cfg80211_add_beacon(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -12241,10 +12213,8 @@ static int __wlan_hdd_cfg80211_set_beacon(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -12331,10 +12301,8 @@ static int __wlan_hdd_cfg80211_stop_ap (struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -12540,13 +12508,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -12677,11 +12640,8 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -12756,10 +12716,8 @@ static int __wlan_hdd_cfg80211_change_bss (struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -12900,10 +12858,8 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -13479,10 +13435,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -13730,13 +13684,8 @@ static int __wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
pAdapter->sessionId, params->key_len));
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -14042,7 +13991,7 @@ static int __wlan_hdd_cfg80211_add_key( struct wiphy *wiphy,
}
}
}
-
+ EXIT();
return 0;
}
@@ -14331,11 +14280,8 @@ static int __wlan_hdd_cfg80211_set_default_key( struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -14530,12 +14476,12 @@ wlan_hdd_cfg80211_inform_bss_frame( hdd_adapter_t *pAdapter,
#endif
hdd_config_t *cfg_param = NULL;
+ ENTER();
+
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return NULL;
- }
cfg_param = pHddCtx->cfg_ini;
mgmt = kzalloc((sizeof (struct ieee80211_mgmt) + ie_length), GFP_KERNEL);
@@ -14643,6 +14589,7 @@ wlan_hdd_cfg80211_inform_bss_frame( hdd_adapter_t *pAdapter,
bss_status = cfg80211_inform_bss_frame(wiphy, chan, mgmt, frame_len, rssi,
GFP_KERNEL);
kfree(mgmt);
+ EXIT();
return bss_status;
}
@@ -15246,13 +15193,8 @@ int __wlan_hdd_cfg80211_scan( struct wiphy *wiphy,
pAdapter->device_mode);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -15623,7 +15565,6 @@ free_mem:
vos_mem_free( channelList );
EXIT();
-
return status;
}
@@ -15856,11 +15797,7 @@ int wlan_hdd_cfg80211_connect_start( hdd_adapter_t *pAdapter,
status = wlan_hdd_validate_context(pHddCtx);
if (status)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid!", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -16842,7 +16779,6 @@ static int __wlan_hdd_cfg80211_connect( struct wiphy *wiphy,
hdd_context_t *pHddCtx;
ENTER();
-
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_CONNECT,
pAdapter->sessionId, pAdapter->device_mode));
@@ -16865,11 +16801,8 @@ static int __wlan_hdd_cfg80211_connect( struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
+ if (0 != status)
return status;
- }
if (vos_max_concurrent_connections_reached()) {
hddLog(VOS_TRACE_LEVEL_ERROR, FL("Reached max concurrent connections"));
@@ -16971,14 +16904,11 @@ int wlan_hdd_disconnect( hdd_adapter_t *pAdapter, u16 reason )
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
- status = wlan_hdd_validate_context(pHddCtx);
+ ENTER();
+ status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
/*stop tx queues*/
hddLog(LOG1, FL("Disabling queues"));
@@ -17021,7 +16951,7 @@ disconnected:
FL("Set HDD connState to eConnectionState_NotConnected"));
hdd_connSetConnectionState(pAdapter,
eConnectionState_NotConnected);
-
+ EXIT();
return result;
}
@@ -17271,13 +17201,8 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
pAdapter->device_mode);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -17425,6 +17350,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
if (0 > status)
hddLog(VOS_TRACE_LEVEL_ERROR, FL("connect failed status: %d"), status);
+ EXIT();
return status;
}
@@ -17461,10 +17387,8 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
TRACE_CODE_HDD_CFG80211_LEAVE_IBSS,
pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE));
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -17497,7 +17421,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
FL("sme_RoamDisconnect failed hal_status(%d)"), hal_status);
return -EAGAIN;
}
-
+ EXIT();
return 0;
}
@@ -17526,17 +17450,12 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
int status;
ENTER();
- MTRACE(vos_trace(VOS_MODULE_ID_HDD,
+ MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS,
NO_SESSION, wiphy->rts_threshold));
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -17646,7 +17565,7 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
}
}
-
+ EXIT();
return 0;
}
@@ -17685,10 +17604,8 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
NO_SESSION, type ));
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -17776,7 +17693,6 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
*dbm = 0;
return status;
}
@@ -17890,13 +17806,8 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
wlan_hdd_get_rssi(pAdapter, &sinfo->signal);
sinfo->filled |= STATION_INFO_SIGNAL;
@@ -18365,13 +18276,8 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -18420,13 +18326,13 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
pAdapter->macAddressCurrent.bytes, pAdapter->sessionId);
}
- EXIT();
if (VOS_STATUS_E_FAILURE == vos_status)
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: failed to enter bmps mode", __func__);
return -EINVAL;
}
+ EXIT();
return 0;
}
@@ -18560,11 +18466,8 @@ static int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -18739,20 +18642,14 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
return -EINVAL;
}
-
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_ADD_STA,
pAdapter->sessionId, params->listen_interval));
if (0 != wlan_hdd_validate_context(pHddCtx))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return -EINVAL;
- }
mask = params->sta_flags_mask;
-
set = params->sta_flags_set;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
@@ -18765,6 +18662,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
}
}
#endif
+ EXIT();
return status;
}
@@ -18801,6 +18699,8 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device
int status;
tPmkidCacheInfo pmk_id;
+ ENTER();
+
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
@@ -18821,11 +18721,8 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device
MAC_ADDR_ARRAY(pmksa->bssid));
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -18839,7 +18736,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_SET_PMKSA,
pAdapter->sessionId, result));
-
+ EXIT();
return HAL_STATUS_SUCCESS(result) ? 0 : -EINVAL;
}
@@ -18864,6 +18761,8 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device
tHalHandle halHandle;
int status = 0;
+ ENTER();
+
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
@@ -18883,11 +18782,8 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device
MAC_ADDR_ARRAY(pmksa->bssid));
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
@@ -18899,7 +18795,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device
MAC_ADDR_ARRAY(pmksa->bssid));
status = -EINVAL;
}
-
+ EXIT();
return status;
}
@@ -18924,15 +18820,12 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_devic
tHalHandle halHandle;
int status = 0;
- hddLog(VOS_TRACE_LEVEL_DEBUG, FL("Flushing PMKSA"));
+ ENTER();
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -18948,7 +18841,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_devic
hddLog(VOS_TRACE_LEVEL_ERROR, FL("Cannot flush PMKIDCache"));
status = -EINVAL;
}
-
+ EXIT();
return status;
}
@@ -18980,6 +18873,8 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
if (status)
return status;
+ ENTER();
+
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
@@ -19005,6 +18900,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
sme_SetFTIEs( WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId,
(const u8 *)ftie->ie,
ftie->ie_len);
+ EXIT();
return 0;
}
@@ -19142,15 +19038,12 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
hdd_config_t *config = NULL;
v_U32_t num_ignore_dfs_ch = 0;
+ ENTER();
+
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
-
if (0 != ret)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return ret;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -19403,6 +19296,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
error:
vos_mem_free(pPnoRequest);
+ EXIT();
return ret;
}
@@ -20042,6 +19936,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
eHalStatus halStatus = eHAL_STATUS_FAILURE;
hddTdlsPeer_t *pTdlsPeer;
+ ENTER();
+
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_CFG80211_TDLS_OPER,
pAdapter->sessionId, oper));
@@ -20053,13 +19949,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
}
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -20330,6 +20221,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
"%s: unsupported event", __func__);
return -ENOTSUPP;
}
+ EXIT();
return 0;
}
@@ -20467,11 +20359,8 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
pAdapter->sessionId, pAdapter->device_mode));
result = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != result) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != result)
return result;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -20518,7 +20407,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
} else {
hddLog(LOG1, FL("wlan not suspended GTKOffload request is stored"));
}
-
+ EXIT();
return result;
}
@@ -20568,13 +20457,8 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -20670,7 +20554,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
pAdapter->device_mode);
return -EINVAL;
}
-
+ EXIT();
return 0;
}
@@ -20778,6 +20662,8 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
if (err)
return err;
+ ENTER();
+
err = nla_parse(tb, WLAN_HDD_TM_ATTR_MAX, data, len, wlan_hdd_tm_policy);
if (err) {
hddLog(LOGE, FL("Testmode INV ATTR"));
@@ -20861,8 +20747,8 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD]));
return -EOPNOTSUPP;
}
-
- return err;
+ EXIT();
+ return err;
}
static int wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
@@ -20955,13 +20841,8 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -21037,7 +20918,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy,
pAdapter->survey_idx = 0;
return -ENONET;
}
-
+ EXIT();
return 0;
}
@@ -21071,10 +20952,8 @@ int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
ENTER();
result = wlan_hdd_validate_context(pHddCtx);
- if (0 != result) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != result)
return result;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -21133,7 +21012,7 @@ int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
}
hddLog(LOG1, FL("cfg80211 scan result database updated"));
-
+ EXIT();
return result;
}
status = hdd_get_next_adapter (pHddCtx, pAdapterNode, &pNext);
@@ -21141,6 +21020,7 @@ int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
}
hddLog(LOG1, FL("Failed to find Adapter"));
+ EXIT();
return result;
}
@@ -21181,11 +21061,10 @@ int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
int rc;
ENTER();
+
rc = wlan_hdd_validate_context(pHddCtx);
- if (0 != rc) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != rc)
return rc;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -21631,12 +21510,12 @@ wlan_hdd_cfg80211_extscan_cached_results_ind(void *ctx,
ENTER();
- if (wlan_hdd_validate_context(pHddCtx) || !data) {
- hddLog(LOGE,
- FL("HDD context is invalid or data(%p) is null"), data);
- return;
+ if (wlan_hdd_validate_context(pHddCtx))
+ return;
+ if (!data) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("data is null"));
+ return;
}
-
spin_lock(&hdd_context_lock);
context = &pHddCtx->ext_scan_context;
ignore_cached_results = context->ignore_cached_results;
@@ -21820,7 +21699,7 @@ wlan_hdd_cfg80211_extscan_cached_results_ind(void *ctx,
complete(&context->response_event);
spin_unlock(&hdd_context_lock);
}
-
+ EXIT();
return;
fail:
@@ -21843,9 +21722,10 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(void *ctx,
ENTER();
- if (wlan_hdd_validate_context(pHddCtx) || !data) {
- hddLog(LOGE, FL("HDD context is invalid or data(%p) is null"),
- data);
+ if (wlan_hdd_validate_context(pHddCtx))
+ return;
+ if (!data) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("data is null"));
return;
}
@@ -21947,6 +21827,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(void *ctx,
}
cfg80211_vendor_event(skb, GFP_KERNEL);
+ EXIT();
return;
fail:
@@ -22257,12 +22138,13 @@ wlan_hdd_cfg80211_extscan_full_scan_result_event(void *ctx,
ENTER();
- if (wlan_hdd_validate_context(pHddCtx) || !pData) {
- hddLog(LOGE, FL("HDD context is invalid or pData(%p) is null"),
- pData);
+ if (wlan_hdd_validate_context(pHddCtx))
return;
- }
+ if (!pData) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("pData is null"));
+ return;
+ }
/*
* If the full scan result including IE data exceeds NL 4K size
* limitation, drop that beacon/probe rsp frame.
@@ -22351,6 +22233,7 @@ wlan_hdd_cfg80211_extscan_full_scan_result_event(void *ctx,
}
cfg80211_vendor_event(skb, GFP_KERNEL);
+ EXIT();
return;
nla_put_failure:
@@ -22477,8 +22360,10 @@ wlan_hdd_cfg80211_extscan_scan_res_available_event(void *ctx,
ENTER();
- if (wlan_hdd_validate_context(pHddCtx) || !pData) {
- hddLog(LOGE, FL("HDD context is invalid or pData(%p) is null"), pData);
+ if (wlan_hdd_validate_context(pHddCtx))
+ return;
+ if (!pData) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("pData is null"));
return;
}
@@ -22505,6 +22390,7 @@ wlan_hdd_cfg80211_extscan_scan_res_available_event(void *ctx,
}
cfg80211_vendor_event(skb, GFP_KERNEL);
+ EXIT();
return;
nla_put_failure:
@@ -22521,8 +22407,10 @@ wlan_hdd_cfg80211_extscan_scan_progress_event(void *ctx,
ENTER();
- if (wlan_hdd_validate_context(pHddCtx) || !pData) {
- hddLog(LOGE, FL("HDD context is invalid or pData(%p) is null"), pData);
+ if (wlan_hdd_validate_context(pHddCtx))
+ return;
+ if (!pData) {
+ hddLog(VOS_TRACE_LEVEL_ERROR, FL("pData is null"));
return;
}
@@ -22551,6 +22439,7 @@ wlan_hdd_cfg80211_extscan_scan_progress_event(void *ctx,
}
cfg80211_vendor_event(skb, GFP_KERNEL);
+ EXIT();
return;
nla_put_failure:
@@ -22691,10 +22580,10 @@ void wlan_hdd_cfg80211_extscan_callback(void *ctx, const tANI_U16 evType,
{
hdd_context_t *pHddCtx = (hdd_context_t *)ctx;
- if (wlan_hdd_validate_context(pHddCtx)) {
- hddLog(LOGE, FL("HDD context is invalid; Received event %d"), evType);
+ ENTER();
+
+ if (wlan_hdd_validate_context(pHddCtx))
return;
- }
hddLog(LOG1, FL("Rcvd Event %d"), evType);
@@ -22769,6 +22658,7 @@ void wlan_hdd_cfg80211_extscan_callback(void *ctx, const tANI_U16 evType,
hddLog(LOGE, FL("Unknown event type %u"), evType);
break;
}
+ EXIT();
}
#endif /* FEATURE_WLAN_EXTSCAN */
diff --git a/CORE/HDD/src/wlan_hdd_debugfs.c b/CORE/HDD/src/wlan_hdd_debugfs.c
index 8717c5bff2ff..e897e3640039 100644
--- a/CORE/HDD/src/wlan_hdd_debugfs.c
+++ b/CORE/HDD/src/wlan_hdd_debugfs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -54,6 +54,8 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
v_U8_t wow_mp = 0;
v_U8_t wow_pbm = 0;
+ ENTER();
+
if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -132,7 +134,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
return -EFAULT;
}
-
+ EXIT();
return count;
}
@@ -250,7 +252,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
hdd_add_wowl_ptrn_debugfs(pAdapter, pattern_idx, pattern_offset,
pattern_buf, pattern_mask);
-
+ EXIT();
return count;
}
@@ -301,6 +303,8 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
v_U16_t pattern_len = 0;
v_U16_t i = 0;
+ ENTER();
+
if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -480,6 +484,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
}
vos_mem_free(cmd);
vos_mem_free(addPeriodicTxPtrnParams);
+ EXIT();
return count;
failure:
@@ -518,9 +523,10 @@ static ssize_t wcnss_patterngen_write(struct file *file,
*/
static int __wcnss_debugfs_open(struct inode *inode, struct file *file)
{
+ ENTER();
if (inode->i_private)
file->private_data = inode->i_private;
-
+ EXIT();
return 0;
}
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 1aa41935fd58..111be5f624e6 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -559,15 +559,15 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
hdd_context_t *pHddCtx;
int status;
+ ENTER();
+
if (pAdapter && pAdapter->dev == ndev &&
(pAdapter->device_mode == WLAN_HDD_INFRA_STATION ||
pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) {
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
- if (0 != status) {
- hddLog(LOGE, FL("HDD context is invalid"));
+ if (0 != status)
return NOTIFY_DONE;
- }
if (pHddCtx->cfg_ini->nEnableSuspend ==
WLAN_MAP_SUSPEND_TO_MCAST_BCAST_FILTER)
@@ -576,7 +576,7 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
hddLog(LOG1, FL("Not scheduling ipv6 wq nEnableSuspend = %d"),
pHddCtx->cfg_ini->nEnableSuspend);
}
-
+ EXIT();
return NOTIFY_DONE;
}
@@ -780,6 +780,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, int fenable)
}
}
}
+ EXIT();
return;
}
@@ -796,15 +797,12 @@ static void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
hdd_context_t *pHddCtx;
int status;
- hddLog(LOG1, FL("Reconfiguring NS Offload"));
+ ENTER();
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(LOGE, FL("HDD context is invalid"));
return;
- }
if ( VOS_FALSE == pHddCtx->sus_res_mcastbcast_filter_valid)
{
@@ -825,6 +823,7 @@ static void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
if (pHddCtx->cfg_ini->fhostNSOffload)
hdd_conf_ns_offload(pAdapter, 2);
}
+ EXIT();
}
/**
@@ -854,6 +853,8 @@ void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, v_BOOL_t fenable)
v_CONTEXT_t *pVosContext = NULL;
VOS_STATUS vstatus = VOS_STATUS_E_FAILURE;
+ ENTER();
+
hddLog(VOS_TRACE_LEVEL_INFO, FL("Configuring offloads with flag: %d"),
fenable);
@@ -971,6 +972,7 @@ void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, v_BOOL_t fenable)
}
}
}
+ EXIT();
return;
}
@@ -1039,16 +1041,15 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
hdd_context_t *pHddCtx;
int status;
+ ENTER();
+
if (pAdapter && pAdapter->dev == ndev &&
(pAdapter->device_mode == WLAN_HDD_INFRA_STATION ||
pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) {
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
status = wlan_hdd_validate_context(pHddCtx);
if (0 != status)
- {
- hddLog(LOGE, FL("HDD context is invalid"));
return NOTIFY_DONE;
- }
if ((pHddCtx->cfg_ini->nEnableSuspend !=
WLAN_MAP_SUSPEND_TO_MCAST_BCAST_FILTER) ||
@@ -1076,7 +1077,7 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
schedule_work(&pAdapter->ipv4NotifierWorkQueue);
}
}
-
+ EXIT();
return NOTIFY_DONE;
}
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 47ed973b1724..2450dd309f93 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -427,6 +427,8 @@ static int hdd_hostapd_driver_command(hdd_adapter_t *pAdapter,
* Note that valid pointers are provided by caller
*/
+ ENTER();
+
if (priv_data->total_len <= 0 ||
priv_data->total_len > HOSTAPD_IOCTL_COMMAND_STRLEN_MAX)
{
@@ -478,6 +480,7 @@ exit:
{
kfree(command);
}
+ EXIT();
return ret;
}
@@ -550,6 +553,8 @@ static int __hdd_hostapd_ioctl(struct net_device *dev,
hdd_context_t *pHddCtx;
int ret;
+ ENTER();
+
if (dev != pAdapter->dev) {
hddLog(VOS_TRACE_LEVEL_ERROR,
"%s: HDD adapter/dev inconsistency", __func__);
@@ -586,6 +591,7 @@ static int __hdd_hostapd_ioctl(struct net_device *dev,
break;
}
exit:
+ EXIT();
return ret;
}
@@ -816,15 +822,13 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter,
hdd_context_t *pHddCtx = NULL;
VOS_STATUS status = VOS_STATUS_SUCCESS;
dev = (struct net_device *)usrDataForCallback;
+
ENTER();
pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if(test_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags))
{
@@ -2597,6 +2601,8 @@ static __iw_softap_setparam(struct net_device *dev,
v_CONTEXT_t pVosContext;
hdd_context_t *pHddCtx = NULL;
+ ENTER();
+
if (NULL == pHostapdAdapter) {
hddLog(LOGE, FL("hostapd Adapter is null"));
return -EINVAL;
@@ -2604,10 +2610,8 @@ static __iw_softap_setparam(struct net_device *dev,
pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid (%d)"), ret);
+ if (0 != ret)
return -EINVAL;
- }
hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
if (!hHal) {
@@ -3266,7 +3270,7 @@ static __iw_softap_setparam(struct net_device *dev,
ret = -EINVAL;
break;
}
-
+ EXIT();
return ret;
}
@@ -3352,13 +3356,12 @@ static __iw_softap_getparam(struct net_device *dev,
eHalStatus status;
int ret = 0; /* success */
hdd_context_t *pHddCtx = NULL;
+
+ ENTER();
pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
switch (sub_cmd)
{
@@ -3561,7 +3564,7 @@ static __iw_softap_getparam(struct net_device *dev,
ret = -EINVAL;
break;
}
-
+ EXIT();
return ret;
}
@@ -3661,10 +3664,12 @@ static __iw_softap_getchannel(struct net_device *dev,
hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev));
int *value = (int *)extra;
+ ENTER();
+
*value = 0;
if (test_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags))
*value = (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->operatingChannel;
-
+ EXIT();
return 0;
}
@@ -3694,6 +3699,8 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
tSirMacAddr bssid = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
tSirMacAddr selfMac = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+ ENTER();
+
if (NULL == value)
return -ENOMEM;
@@ -3710,7 +3717,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
__func__);
return -EIO;
}
-
+ EXIT();
return 0;
}
@@ -3740,9 +3747,12 @@ static __iw_display_data_path_snapshot(struct net_device *dev,
* DXE Snapshot (Called at the end of TL Snapshot)
*/
hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev));
- hddLog(LOGE, "%s: called for SAP",__func__);
+
+ ENTER();
+
hdd_wmm_tx_snapshot(pHostapdAdapter);
WLANTL_TLDebugMessage(VOS_TRUE);
+ EXIT();
return 0;
}
@@ -3771,6 +3781,8 @@ static __iw_softap_set_tx_power(struct net_device *dev,
int set_value;
tSirMacAddr bssid;
+ ENTER();
+
if (NULL == value)
return -ENOMEM;
@@ -3786,7 +3798,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
__func__);
return -EIO;
}
-
+ EXIT();
return 0;
}
@@ -3820,6 +3832,8 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
/* maclist_index must be u32 to match user space */
u32 maclist_index;
+ ENTER();
+
/*
* NOTE WELL: this is a "get" ioctl but it uses an even ioctl
* number, and even numbered iocts are supposed to have "set"
@@ -3872,6 +3886,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
ret = -EFAULT;
}
kfree(buf);
+ EXIT();
return ret;
}
@@ -3955,6 +3970,8 @@ static __iw_softap_ap_stats(struct net_device *dev,
char *pstatbuf;
int len;
+ ENTER();
+
memset(&statBuffer, 0, sizeof(statBuffer));
WLANSAP_GetStatistics((WLAN_HDD_GET_CTX(pHostapdAdapter))->pvosContext,
&statBuffer, (v_BOOL_t)wrqu->data.flags);
@@ -3985,6 +4002,7 @@ static __iw_softap_ap_stats(struct net_device *dev,
}
wrqu->data.length -= len;
kfree(pstatbuf);
+ EXIT();
return 0;
}
@@ -4114,7 +4132,6 @@ int __iw_get_genie(struct net_device *dev,
v_U32_t length = DOT11F_IE_RSN_MAX_LEN;
v_U8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN];
ENTER();
- hddLog(LOG1,FL("getGEN_IE ioctl"));
// Actually retrieve the RSN IE from CSR. (We previously sent it down in the CSR Roam Profile.)
status = WLANSap_getstationIE_information(
#ifdef WLAN_FEATURE_MBSSID
@@ -4167,7 +4184,6 @@ int __iw_get_WPSPBCProbeReqIEs(struct net_device *dev,
hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter);
ENTER();
- hddLog(LOG1,FL("get_WPSPBCProbeReqIEs ioctl"));
memset((void*)&WPSPBCProbeReqIEs, 0, sizeof(WPSPBCProbeReqIEs));
WPSPBCProbeReqIEs.probeReqIELen = pHddApCtx->WPSPBCProbeReq.probeReqIELen;
@@ -4478,7 +4494,8 @@ static int __iw_set_ap_encodeext(struct net_device *dev,
retval = -EINVAL;
}
- return retval;
+ EXIT();
+ return retval;
}
/**
@@ -4729,7 +4746,8 @@ static int __iw_get_ap_freq(struct net_device *dev,
fwrq->e = MHZ;
}
}
- return 0;
+ EXIT();
+ return 0;
}
/**
@@ -5169,11 +5187,8 @@ static int __iw_softap_stopbss(struct net_device *dev,
pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
status = wlan_hdd_validate_context(pHddCtx);
-
- if (0 != status) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != status)
return status;
- }
if(test_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags))
{
@@ -5258,6 +5273,8 @@ hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, v_U8_t *pBuf, int buf_len)
pBuf += len;
buf_len -= len;
+ ENTER();
+
if(pHddCtx)
maxSta = pHddCtx->cfg_ini->maxNumberOfPeers;
@@ -5281,6 +5298,7 @@ hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, v_U8_t *pBuf, int buf_len)
break;
}
}
+ EXIT();
return VOS_STATUS_SUCCESS;
}
@@ -5478,14 +5496,12 @@ __iw_get_softap_linkspeed(struct net_device *dev, struct iw_request_info *info,
VOS_STATUS status = VOS_STATUS_E_FAILURE;
int rc, valid, i;
+ ENTER();
+
pHddCtx = WLAN_HDD_GET_CTX(pHostapdAdapter);
valid = wlan_hdd_validate_context(pHddCtx);
-
if (0 != valid)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context not valid"));
return valid;
- }
hddLog(VOS_TRACE_LEVEL_INFO, "%s wrqu->data.length= %d\n", __func__, wrqu->data.length);
@@ -5551,7 +5567,7 @@ __iw_get_softap_linkspeed(struct net_device *dev, struct iw_request_info *info,
hddLog(VOS_TRACE_LEVEL_ERROR,FL("Unable to encode link speed"));
return -EIO;
}
-
+ EXIT();
return 0;
}
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 8f37cb0812ad..69786d05c73f 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -3945,6 +3945,8 @@ static int hdd_driver_command(hdd_adapter_t *pAdapter,
tANI_U8 *command = NULL;
int ret = 0;
+ ENTER();
+
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
return -EINVAL;
@@ -6134,6 +6136,7 @@ exit:
{
kfree(command);
}
+ EXIT();
return ret;
}
@@ -6203,6 +6206,8 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
hdd_context_t *pHddCtx;
long ret = 0;
+ ENTER();
+
if (dev != pAdapter->dev) {
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s: HDD adapter/dev inconsistency", __func__);
@@ -6248,6 +6253,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
break;
}
exit:
+ EXIT();
return ret;
}
@@ -7363,10 +7369,8 @@ static int __hdd_stop(struct net_device *dev)
pAdapter->sessionId, pAdapter->device_mode));
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
/* Nothing to be done if the interface is not opened */
if (VOS_FALSE == test_bit(DEVICE_IFACE_OPENED, &pAdapter->event_flags))
@@ -7718,6 +7722,8 @@ static void __hdd_set_multicast_list(struct net_device *dev)
int i = 0;
struct netdev_hw_addr *ha;
+ ENTER();
+
if (dev->flags & IFF_ALLMULTI)
{
hddLog(VOS_TRACE_LEVEL_INFO,
@@ -7750,6 +7756,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
i++;
}
}
+ EXIT();
return;
}
diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index de0574164de9..0d921f9db46d 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -111,9 +111,10 @@ static int __iw_get_oem_data_rsp(struct net_device *dev,
eHalStatus status;
struct iw_oem_data_rsp* pHddOemDataRsp;
tOemDataRsp* pSmeOemDataRsp;
-
hdd_adapter_t *pAdapter = (netdev_priv(dev));
+ ENTER();
+
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -146,7 +147,7 @@ static int __iw_get_oem_data_rsp(struct net_device *dev,
}
}
} while(0);
-
+ EXIT();
return rc;
}
@@ -197,6 +198,8 @@ static int __iw_set_oem_data_req(struct net_device *dev,
hdd_adapter_t *pAdapter = (netdev_priv(dev));
hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
+ ENTER();
+
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -246,7 +249,7 @@ static int __iw_set_oem_data_req(struct net_device *dev,
pwextBuf->oemDataReqInProgress = TRUE;
} while (0);
-
+ EXIT();
return rc;
}
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index c15f5b9932f0..843ea8ab76e8 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -742,6 +742,8 @@ static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy,
int ret = 0;
int status = 0;
+ ENTER();
+
hddLog(LOG1, FL("Device_mode %s(%d)"),
hdd_device_mode_to_string(pAdapter->device_mode),
pAdapter->device_mode);
@@ -764,10 +766,8 @@ static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy,
*/
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
if (hdd_isConnectionInProgress((hdd_context_t *)pAdapter->pHddCtx)) {
hddLog(LOGE, FL("Connection is in progress"));
@@ -849,7 +849,7 @@ static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy,
if (isBusy == VOS_FALSE) {
schedule_delayed_work(&pHddCtx->rocReqWork, 0);
}
-
+ EXIT();
return 0;
}
@@ -869,6 +869,9 @@ int __wlan_hdd_cfg80211_remain_on_channel( struct wiphy *wiphy,
struct net_device *dev = wdev->netdev;
#endif
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR( dev );
+ int ret;
+
+ ENTER();
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -878,13 +881,15 @@ int __wlan_hdd_cfg80211_remain_on_channel( struct wiphy *wiphy,
MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_REMAIN_ON_CHANNEL,
pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST));
- return wlan_hdd_request_remain_on_channel(wiphy, dev,
+ ret = wlan_hdd_request_remain_on_channel(wiphy, dev,
chan,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) && !defined(WITH_BACKPORTS)
channel_type,
#endif
duration, cookie,
REMAIN_ON_CHANNEL_REQUEST);
+ EXIT();
+ return ret;
}
int wlan_hdd_cfg80211_remain_on_channel( struct wiphy *wiphy,
@@ -1049,16 +1054,11 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy,
hdd_list_node_t *tmp, *q;
hdd_roc_req_t *curr_roc_req;
- hddLog( LOG1, "Cancel remain on channel");
+ ENTER();
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -1170,7 +1170,7 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy,
"%s:wait on cancel_rem_on_chan_var timed out ", __func__);
}
hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_ROC);
-
+ EXIT();
return 0;
}
@@ -1239,17 +1239,14 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
unsigned long rc;
hdd_adapter_t *goAdapter;
- MTRACE(vos_trace(VOS_MODULE_ID_HDD,
+ ENTER();
+
+ MTRACE(vos_trace(VOS_MODULE_ID_HDD,
TRACE_CODE_HDD_ACTION, pAdapter->sessionId,
pAdapter->device_mode ));
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -1594,6 +1591,7 @@ err_rem_channel:
pAdapter->dev,
#endif
*cookie, buf, len, FALSE, GFP_KERNEL );
+ EXIT();
return 0;
}
@@ -2129,10 +2127,8 @@ struct net_device* __wlan_hdd_add_virtual_intf(
ENTER();
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+ if (0 != ret)
return ERR_PTR(ret);
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
@@ -2266,13 +2262,8 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
pVirtAdapter->device_mode);
status = wlan_hdd_validate_context(pHddCtx);
-
if (0 != status)
- {
- VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- "%s: HDD context is not valid", __func__);
return status;
- }
if (VOS_FTM_MODE == hdd_get_conparam()) {
hddLog(LOGE, FL("Command not allowed in FTM mode"));
diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index b51d1f26fb6d..0d525f06d51b 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -607,8 +607,6 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info,
ENTER();
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: enter !!!",__func__);
-
/* Block All Scan during DFS operation and send null scan result */
con_sap_adapter = hdd_get_con_sap_adapter(pAdapter, true);
if (con_sap_adapter) {
@@ -741,8 +739,6 @@ error:
vos_mem_free(scanRequest.SSIDs.SSIDList);
EXIT();
-
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: exit !!!",__func__);
return status;
}
@@ -790,9 +786,9 @@ static int __iw_get_scan(struct net_device *dev,
tScanResultHandle pResult;
int i = 0;
+ ENTER();
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: enter buffer length %d!!!",
__func__, (wrqu->data.length)?wrqu->data.length:IW_SCAN_MAX_DATA);
- ENTER();
if (TRUE == pAdapter->scan_info.mScanPending)
{
@@ -842,8 +838,8 @@ static int __iw_get_scan(struct net_device *dev,
sme_ScanResultPurge(hHal, pResult);
- EXIT();
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s: exit total %d BSS reported !!!",__func__, i);
+ EXIT();
return status;
}
diff --git a/CORE/HDD/src/wlan_hdd_tdls.c b/CORE/HDD/src/wlan_hdd_tdls.c
index 412003620a0b..84e75868c671 100644
--- a/CORE/HDD/src/wlan_hdd_tdls.c
+++ b/CORE/HDD/src/wlan_hdd_tdls.c
@@ -295,6 +295,8 @@ static v_VOID_t wlan_hdd_tdls_discovery_timeout_peer_cb(v_PVOID_t userData)
tdlsCtx_t *pHddTdlsCtx;
hdd_context_t *pHddCtx;
+ ENTER();
+
pHddTdlsCtx = (tdlsCtx_t *)userData;
if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter) )
{
@@ -310,13 +312,6 @@ static v_VOID_t wlan_hdd_tdls_discovery_timeout_peer_cb(v_PVOID_t userData)
pHddCtx = WLAN_HDD_GET_CTX( pHddTdlsCtx->pAdapter );
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
- return;
- }
-
- if (NULL == pHddCtx)
return;
mutex_lock(&pHddCtx->tdls_lock);
@@ -346,6 +341,7 @@ static v_VOID_t wlan_hdd_tdls_discovery_timeout_peer_cb(v_PVOID_t userData)
wlan_hdd_tdls_check_bmps(pHddTdlsCtx->pAdapter);
+ EXIT();
return;
}
@@ -846,11 +842,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac)
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return NULL;
- }
/* if already there, just update */
peer = wlan_hdd_tdls_find_peer(pAdapter, mac, TRUE);
@@ -890,7 +882,6 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac)
list_add_tail(&peer->node, head);
mutex_unlock(&pHddCtx->tdls_lock);
-
return peer;
}
@@ -1051,6 +1042,8 @@ int wlan_hdd_tdls_recv_discovery_resp(hdd_adapter_t *pAdapter, u8 *mac)
tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);
hdd_context_t *pHddCtx;
+ ENTER();
+
if ( NULL == pHddTdlsCtx )
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1061,11 +1054,7 @@ int wlan_hdd_tdls_recv_discovery_resp(hdd_adapter_t *pAdapter, u8 *mac)
pHddCtx = WLAN_HDD_GET_CTX(pHddTdlsCtx->pAdapter);
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return -1;
- }
curr_peer = wlan_hdd_tdls_get_peer(pAdapter, mac);
@@ -1133,6 +1122,7 @@ int wlan_hdd_tdls_recv_discovery_resp(hdd_adapter_t *pAdapter, u8 *mac)
}
curr_peer->tdls_support = eTDLS_CAP_SUPPORTED;
+ EXIT();
return 0;
}
@@ -1422,15 +1412,13 @@ static void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx,
hdd_adapter_t *pAdapter;
tdlsCtx_t *pHddTdlsCtx;
+ ENTER();
+
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s mode %d", __func__, (int)tdls_mode);
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return;
- }
mutex_lock(&pHddCtx->tdls_lock);
@@ -1470,6 +1458,7 @@ static void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx,
pHddCtx->tdls_mode = tdls_mode;
mutex_unlock(&pHddCtx->tdls_lock);
+ EXIT();
}
int wlan_hdd_tdls_set_params(struct net_device *dev, tdls_config_params_t *config)
@@ -1807,12 +1796,10 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter,
tdlsCtx_t *pHddTdlsCtx;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
+
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return NULL;
- }
if ( mutexLock )
{
@@ -1842,6 +1829,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter,
}
if ( mutexLock )
mutex_unlock(&pHddCtx->tdls_lock);
+ EXIT();
return NULL;
}
@@ -1928,13 +1916,12 @@ tANI_U16 wlan_hdd_tdlsConnectedPeers(hdd_adapter_t *pAdapter)
}
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
+
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return 0;
- }
+ EXIT();
return pHddCtx->connected_peer_count;
}
@@ -1948,12 +1935,10 @@ int wlan_hdd_tdls_get_all_peers(hdd_adapter_t *pAdapter, char *buf, int buflen)
tdlsCtx_t *pHddTdlsCtx;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
+
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return 0;
- }
init_len = buflen;
len = scnprintf(buf, buflen, "\n%-18s%-3s%-4s%-3s%-5s\n",
@@ -1993,6 +1978,7 @@ int wlan_hdd_tdls_get_all_peers(hdd_adapter_t *pAdapter, char *buf, int buflen)
}
}
mutex_unlock(&pHddCtx->tdls_lock);
+ EXIT();
return init_len-buflen;
}
@@ -2073,12 +2059,10 @@ void wlan_hdd_tdls_increment_peer_count(hdd_adapter_t *pAdapter)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
+
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return;
- }
mutex_lock(&pHddCtx->tdls_lock);
@@ -2089,18 +2073,17 @@ void wlan_hdd_tdls_increment_peer_count(hdd_adapter_t *pAdapter)
__func__, pHddCtx->connected_peer_count);
mutex_unlock(&pHddCtx->tdls_lock);
+ EXIT();
}
void wlan_hdd_tdls_decrement_peer_count(hdd_adapter_t *pAdapter)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
+
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return;
- }
mutex_lock(&pHddCtx->tdls_lock);
@@ -2112,7 +2095,7 @@ void wlan_hdd_tdls_decrement_peer_count(hdd_adapter_t *pAdapter)
__func__, pHddCtx->connected_peer_count);
mutex_unlock(&pHddCtx->tdls_lock);
-
+ EXIT();
}
void wlan_hdd_tdls_check_bmps(hdd_adapter_t *pAdapter)
@@ -2288,12 +2271,10 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work)
int status;
tSirMacAddr peer_mac;
+ ENTER();
+
if (NULL == pHddTdlsCtx)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddTdlsCtx is NULL"));
return;
- }
if (unlikely(TDLS_CTX_MAGIC != pHddTdlsCtx->magic))
{
@@ -2433,6 +2414,7 @@ done:
pHddTdlsCtx->curr_candidate = NULL;
pHddTdlsCtx->magic = 0;
mutex_unlock(&pHddCtx->tdls_lock);
+ EXIT();
return;
}
@@ -2452,12 +2434,10 @@ int wlan_hdd_tdls_copy_scan_context(hdd_context_t *pHddCtx,
{
tdls_scan_context_t *scan_ctx;
+ ENTER();
+
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return -1;
- }
scan_ctx = &pHddCtx->tdls_scan_ctxt;
@@ -2467,6 +2447,7 @@ int wlan_hdd_tdls_copy_scan_context(hdd_context_t *pHddCtx,
#endif
scan_ctx->scan_request = request;
+ EXIT();
return 0;
}
@@ -2508,6 +2489,7 @@ int wlan_hdd_tdls_scan_callback (hdd_adapter_t *pAdapter,
unsigned long delay;
int ret;
+ ENTER();
ret = wlan_hdd_validate_context(pHddCtx);
if (ret)
return ret;
@@ -2659,6 +2641,7 @@ int wlan_hdd_tdls_scan_callback (hdd_adapter_t *pAdapter,
"%s: tdls_mode %d, and no tdls connection. scan allowed",
__func__, pHddCtx->tdls_mode);
}
+ EXIT();
return 1;
}
@@ -2666,12 +2649,9 @@ void wlan_hdd_tdls_scan_done_callback(hdd_adapter_t *pAdapter)
{
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ ENTER();
if (0 != (wlan_hdd_validate_context(pHddCtx)))
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("pHddCtx is not valid"));
return;
-}
/* free allocated memory at scan time */
wlan_hdd_tdls_free_scan_request (&pHddCtx->tdls_scan_ctxt);
@@ -2686,6 +2666,7 @@ void wlan_hdd_tdls_scan_done_callback(hdd_adapter_t *pAdapter)
wlan_hdd_tdls_set_mode(pHddCtx, pHddCtx->tdls_mode_last, FALSE);
}
wlan_hdd_tdls_check_bmps(pAdapter);
+ EXIT();
}
void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter,
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index f6c4f631f1c7..02762ccfc898 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -433,6 +433,7 @@ static void __hdd_mon_tx_mgmt_pkt(hdd_adapter_t* pAdapter)
int ret = 0;
struct tagCsrDelStaParams delStaParams;
+ ENTER();
if (pAdapter == NULL)
{
VOS_TRACE( VOS_MODULE_ID_HDD_DATA, VOS_TRACE_LEVEL_ERROR,
@@ -443,10 +444,8 @@ static void __hdd_mon_tx_mgmt_pkt(hdd_adapter_t* pAdapter)
hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(hdd_ctx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != ret)
return;
- }
pMonAdapter = hdd_get_adapter( pAdapter->pHddCtx, WLAN_HDD_MONITOR );
if (pMonAdapter == NULL)
@@ -529,10 +528,12 @@ static void __hdd_mon_tx_mgmt_pkt(hdd_adapter_t* pAdapter)
"%s: WLANSAP_SendAction returned fail", __func__);
hdd_sendActionCnf( pAdapter, FALSE );
}
+ EXIT();
return;
mgmt_handled:
hdd_sendActionCnf( pAdapter, TRUE );
+ EXIT();
return;
fail:
kfree_skb(pAdapter->skb_to_tx);
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index b3a714c9af80..7464d987d2e7 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -1212,6 +1212,7 @@ VOS_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, v_S7_t *snr)
unsigned long rc;
int valid;
+ ENTER();
if (NULL == pAdapter)
{
hddLog(VOS_TRACE_LEVEL_ERROR,
@@ -1220,13 +1221,9 @@ VOS_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, v_S7_t *snr)
}
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-
valid = wlan_hdd_validate_context(pHddCtx);
if (0 != valid)
- {
- hddLog(VOS_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
return VOS_STATUS_E_FAULT;
- }
pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -1272,7 +1269,7 @@ VOS_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, v_S7_t *snr)
spin_unlock(&hdd_context_lock);
*snr = pAdapter->snr;
-
+ EXIT();
return VOS_STATUS_SUCCESS;
}
@@ -3236,6 +3233,7 @@ static int iw_get_linkspeed(struct net_device *dev,
int rc;
int ret_val;
+ ENTER();
ret_val = wlan_hdd_get_link_speed(pAdapter, &link_speed);
if (0 != ret_val) {
return ret_val;
@@ -3252,7 +3250,8 @@ static int iw_get_linkspeed(struct net_device *dev,
}
/* a value is being successfully returned */
- return rc;
+ EXIT();
+ return rc;
}
/*
@@ -5152,6 +5151,8 @@ static int __iw_setint_getnone(struct net_device *dev,
#ifdef CONFIG_HAS_EARLYSUSPEND
v_U8_t nEnableSuspendOld;
#endif
+
+ ENTER();
INIT_COMPLETION(pWextState->completion_var);
memset(&smeConfig, 0x00, sizeof(smeConfig));
@@ -6350,6 +6351,7 @@ static int __iw_setint_getnone(struct net_device *dev,
break;
}
}
+ EXIT();
return ret;
}
@@ -6383,6 +6385,7 @@ static int __iw_setchar_getnone(struct net_device *dev,
#endif /* WLAN_FEATURE_VOWIFI */
struct iw_point s_priv_data;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -6487,6 +6490,7 @@ static int __iw_setchar_getnone(struct net_device *dev,
}
}
kfree(pBuffer);
+ EXIT();
return ret;
}
@@ -6573,6 +6577,7 @@ static int __iw_setnone_getint(struct net_device *dev,
void *wmapvosContext = wmahddCtxt->pvosContext;
tSmeConfigParams smeConfig;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -7089,7 +7094,7 @@ static int __iw_setnone_getint(struct net_device *dev,
break;
}
}
-
+ EXIT();
return ret;
}
@@ -7117,6 +7122,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev,
int sub_cmd = value[0];
int ret = 0;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress) {
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
"%s:LOGP in Progress. Ignore!!!", __func__);
@@ -7134,6 +7140,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev,
break;
}
+ EXIT();
return ret;
}
@@ -7164,6 +7171,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
#endif
+ ENTER();
if (NULL == WLAN_HDD_GET_CTX(pAdapter))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -7591,7 +7599,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
break;
}
}
-
+ EXIT();
return 0;
}
@@ -7617,6 +7625,7 @@ static int __iw_setnone_getnone(struct net_device *dev,
int ret = 0; /* success */
int sub_cmd;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -7742,7 +7751,7 @@ static int __iw_setnone_getnone(struct net_device *dev,
break;
}
}
-
+ EXIT();
return ret;
}
@@ -7811,6 +7820,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
hdd_context_t *pHddCtx = NULL;
int ret = 0, num_args;
+ ENTER();
if (extra == NULL) {
hddLog(LOGE, FL("NULL extra buffer pointer"));
return -EINVAL;
@@ -7823,10 +7833,8 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
ret = wlan_hdd_validate_context(pHddCtx);
- if (0 != ret) {
- hddLog(LOGE, FL("HDD context is not valid"));
+ if (0 != ret)
return ret;
- }
if(( sub_cmd == WE_MCC_CONFIG_CREDENTIAL ) ||
(sub_cmd == WE_MCC_CONFIG_PARAMS ))
@@ -8029,7 +8037,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
}
break;
}
-
+ EXIT();
return 0;
}
@@ -8103,6 +8111,7 @@ static int __iw_add_tspec(struct net_device *dev,
v_U32_t handle;
struct iw_point s_priv_data;
+ ENTER();
/*
* Make sure the application is sufficiently privileged
* note that the kernel will do this for "set" ioctls, but since
@@ -8247,6 +8256,7 @@ static int __iw_add_tspec(struct net_device *dev,
}
*pStatus = hdd_wmm_addts(pAdapter, handle, &tSpec);
+ EXIT();
return 0;
}
@@ -8272,6 +8282,7 @@ static int __iw_del_tspec(struct net_device *dev,
hdd_wlan_wmm_status_e *pStatus = (hdd_wlan_wmm_status_e *)extra;
v_U32_t handle;
+ ENTER();
/*
* Make sure the application is sufficiently privileged
* note that the kernel will do this for "set" ioctls, but since
@@ -8304,6 +8315,7 @@ static int __iw_del_tspec(struct net_device *dev,
}
*pStatus = hdd_wmm_delts(pAdapter, handle);
+ EXIT();
return 0;
}
@@ -8329,6 +8341,7 @@ static int __iw_get_tspec(struct net_device *dev,
hdd_wlan_wmm_status_e *pStatus = (hdd_wlan_wmm_status_e *)extra;
v_U32_t handle;
+ ENTER();
// although we are defined to be a "get" ioctl, the params we require
// will fit in the iwreq_data, therefore unlike iw_add_tspec() there
// is no need to copy the params from user space
@@ -8350,6 +8363,7 @@ static int __iw_get_tspec(struct net_device *dev,
}
*pStatus = hdd_wmm_checkts(pAdapter, handle);
+ EXIT();
return 0;
}
@@ -8381,6 +8395,7 @@ static int __iw_set_fties(struct net_device *dev,
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
//v_CONTEXT_t pVosContext;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -8413,7 +8428,7 @@ static int __iw_set_fties(struct net_device *dev,
// Pass the received FT IEs to SME
sme_SetFTIEs( WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, extra,
wrqu->data.length);
-
+ EXIT();
return 0;
}
@@ -8445,6 +8460,7 @@ static int __iw_set_dynamic_mcbc_filter(struct net_device *dev,
int idx;
eHalStatus ret_val;
+ ENTER();
if (pHddCtx->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -8548,7 +8564,7 @@ static int __iw_set_dynamic_mcbc_filter(struct net_device *dev,
}
}
}
-
+ EXIT();
return 0;
}
@@ -8574,8 +8590,8 @@ static int __iw_clear_dynamic_mcbc_filter(struct net_device *dev,
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
tpSirWlanSetRxpFilters wlanRxpFilterParam;
- hddLog(VOS_TRACE_LEVEL_INFO_HIGH, "%s: ", __func__);
+ ENTER();
//Reset the filter to INI value as we have to clear the dynamic filter
pHddCtx->configuredMcastBcastFilter = pHddCtx->cfg_ini->mcastBcastFilterSetting;
@@ -8615,6 +8631,7 @@ static int __iw_clear_dynamic_mcbc_filter(struct net_device *dev,
pHddCtx->cfg_ini->mcastBcastFilterSetting;
}
}
+ EXIT();
return 0;
}
@@ -8640,6 +8657,7 @@ static int __iw_set_host_offload(struct net_device *dev,
tpHostOffloadRequest pRequest = (tpHostOffloadRequest) extra;
tSirHostOffloadReq offloadRequest;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -8708,7 +8726,7 @@ static int __iw_set_host_offload(struct net_device *dev,
__func__);
return -EINVAL;
}
-
+ EXIT();
return 0;
}
@@ -8734,6 +8752,7 @@ static int __iw_set_keepalive_params(struct net_device *dev,
tpKeepAliveRequest pRequest = (tpKeepAliveRequest) extra;
tSirKeepAliveReq keepaliveRequest;
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
@@ -8793,7 +8812,7 @@ static int __iw_set_keepalive_params(struct net_device *dev,
__func__);
return -EINVAL;
}
-
+ EXIT();
return 0;
}
@@ -9200,6 +9219,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev,
int ret;
struct iw_point s_priv_data;
+ ENTER();
if (hdd_priv_get_data(&s_priv_data, wrqu)) {
return -EINVAL;
}
@@ -9220,7 +9240,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev,
ret = wlan_hdd_set_filter(WLAN_HDD_GET_CTX(pAdapter), pRequest,
pAdapter->sessionId);
kfree(pRequest);
-
+ EXIT();
return ret;
}
@@ -9250,8 +9270,8 @@ static int __iw_get_statistics(struct net_device *dev,
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
char *p = extra;
int tlen = 0;
- tCsrSummaryStatsInfo *pStats = &(pAdapter->hdd_stats.summary_stat);
+ tCsrSummaryStatsInfo *pStats = &(pAdapter->hdd_stats.summary_stat);
tCsrGlobalClassAStatsInfo *aStats = &(pAdapter->hdd_stats.ClassA_stat);
tCsrGlobalClassDStatsInfo *dStats = &(pAdapter->hdd_stats.ClassD_stat);
@@ -9763,9 +9783,9 @@ static int __iw_set_pno_priv(struct net_device *dev,
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
+ VOS_STATUS status;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Set PNO Private");
+ ENTER();
if ((WLAN_HDD_GET_CTX(pAdapter))->isLogpInProgress)
{
@@ -9773,7 +9793,10 @@ static int __iw_set_pno_priv(struct net_device *dev,
"%s:LOGP in Progress. Ignore!!!", __func__);
return -EBUSY;
}
- return iw_set_pno(dev,info,wrqu,extra,0);
+ status = iw_set_pno(dev,info,wrqu,extra,0);
+
+ EXIT();
+ return status;
}
static int iw_set_pno_priv(struct net_device *dev,
@@ -9803,6 +9826,8 @@ int hdd_setBand(struct net_device *dev, u8 ui_band)
eCsrBand currBand = eCSR_BAND_MAX;
eCsrBand connectedBand;
+ ENTER();
+
pAdapterNode = NULL;
pNext = NULL;
pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -9931,6 +9956,7 @@ int hdd_setBand(struct net_device *dev, u8 ui_band)
}
wlan_hdd_cfg80211_update_band(pHddCtx->wiphy, (eCsrBand)band);
}
+ EXIT();
return 0;
}
@@ -9988,8 +10014,8 @@ static int __iw_set_power_params_priv(struct net_device *dev,
{
int ret;
char *ptr;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "Set power params Private");
+
+ ENTER();
/* ODD number is used for set, copy data using copy_from_user */
ptr = mem_alloc_copy_from_user_helper(wrqu->data.pointer,
wrqu->data.length);
@@ -10002,6 +10028,7 @@ static int __iw_set_power_params_priv(struct net_device *dev,
ret = iw_set_power_params(dev, info, wrqu, ptr, 0);
kfree(ptr);
+ EXIT();
return ret;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-11 04:36:50 +0000