From 6ee91eeeb336256e3120090a5e57a0c706c87e7b Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 18:55:30 -0800 Subject: [PATCH] qcacld-3.0: Use ENTER_DEV() in STA private WEXT ioctls The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all STA-mode private wireless extensions ioctl handlers to use this macro. Change-Id: I5a69d2a92c82bcf7931350e12ee7610748f5e3ab CRs-Fixed: 975414 --- core/hdd/src/wlan_hdd_ocb.c | 2 ++ core/hdd/src/wlan_hdd_wext.c | 40 +++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 0a5c267ea6d9..9b439b71e89d 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -487,6 +487,8 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, int i, j; struct sir_ocb_config_channel *curr_chan; + ENTER_DEV(dev); + if (wlan_hdd_validate_context(WLAN_HDD_GET_CTX(adapter))) { hddLog(LOGE, FL("HDD context is not valid")); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index e8760a524111..2e1badca6a22 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3564,7 +3564,7 @@ static int __iw_get_linkspeed(struct net_device *dev, hdd_context_t *hdd_ctx; int rc, valid; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); valid = wlan_hdd_validate_context(hdd_ctx); @@ -4942,7 +4942,7 @@ static int __iw_setint_getnone(struct net_device *dev, int enable_pbm, enable_mp; QDF_STATUS status; - ENTER(); + ENTER_DEV(dev); INIT_COMPLETION(pWextState->completion_var); memset(&smeConfig, 0x00, sizeof(smeConfig)); @@ -6187,14 +6187,14 @@ static int __iw_setchar_getnone(struct net_device *dev, struct hdd_config *pConfig = hdd_ctx->config; struct iw_point s_priv_data; + ENTER_DEV(dev); + if (!capable(CAP_NET_ADMIN)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } - ENTER(); - ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; @@ -6327,7 +6327,7 @@ static int __iw_setnone_getint(struct net_device *dev, tSmeConfigParams smeConfig; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -6831,7 +6831,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, int ret; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -6938,7 +6938,7 @@ static int __iw_get_char_setnone(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); #endif - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -7444,7 +7444,7 @@ static int __iw_setnone_getnone(struct net_device *dev, int ret; int sub_cmd; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -7608,7 +7608,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, hdd_context_t *hdd_ctx; int ret, num_args; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8060,7 +8060,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8232,7 +8232,7 @@ static int __iw_del_tspec(struct net_device *dev, struct iw_request_info *info, uint32_t handle; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8296,7 +8296,7 @@ static int __iw_get_tspec(struct net_device *dev, struct iw_request_info *info, uint32_t handle; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8354,7 +8354,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8418,7 +8418,7 @@ static int __iw_set_host_offload(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8533,7 +8533,7 @@ static int __iw_set_keepalive_params(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8751,7 +8751,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev, return -EPERM; } - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8825,7 +8825,7 @@ static int __iw_get_statistics(struct net_device *dev, tCsrGlobalClassDStatsInfo *dStats = &(pAdapter->hdd_stats.ClassD_stat); int ret; - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -9076,7 +9076,7 @@ static int __iw_set_pno(struct net_device *dev, */ static tSirPNOScanReq request; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9421,7 +9421,7 @@ static int __iw_set_band_config(struct net_device *dev, { int *value = (int *)extra; - ENTER(); + ENTER_DEV(dev); if (!capable(CAP_NET_ADMIN)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, @@ -9455,6 +9455,8 @@ static int __iw_set_two_ints_getnone(struct net_device *dev, int ret; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); + ENTER_DEV(dev); + ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret;