Browse Source

qcacld-3.0: Use ENTER_DEV() in cfg80211 vendor commands

The ENTER_DEV macro was introduced to log both the function and device
name when a function is entered.  Update all cfg80211 vendor command
handlers to use this macro.

Change-Id: I3bb7112c6e5967577fa0f891e0b37ad7412bd2fc
CRs-Fixed: 975826
Jeff Johnson 9 years ago
parent
commit
1f61b61df4

+ 38 - 7
core/hdd/src/wlan_hdd_cfg80211.c

@@ -671,6 +671,8 @@ static int __wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy,
 	struct sk_buff *skb;
 	uint32_t set = 0;
 
+	ENTER_DEV(wdev->netdev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -1100,7 +1102,7 @@ static int __is_driver_dfs_capable(struct wiphy *wiphy,
 	int ret_val;
 	hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	ENTER_DEV(wdev->netdev);
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)
@@ -1413,6 +1415,8 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	 * [QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST] = { .type = NLA_NESTED },
 	 */
 
+	ENTER_DEV(ndev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -1800,7 +1804,7 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy,
 	uint32_t fset = 0;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(wdev->netdev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1941,7 +1945,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy,
 	QDF_STATUS status;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(wdev->netdev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -2064,6 +2068,8 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy,
 	uint8_t feature_flags[(NUM_QCA_WLAN_VENDOR_FEATURES + 7) / 8] = {0};
 	hdd_context_t *hdd_ctx_ptr = wiphy_priv(wiphy);
 
+	ENTER_DEV(wdev->netdev);
+
 	ret_val = wlan_hdd_validate_context(hdd_ctx_ptr);
 	if (ret_val)
 		return ret_val;
@@ -2187,6 +2193,8 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 	uint32_t buf_len = 0;
 	int ret;
 
+	ENTER_DEV(dev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -2630,7 +2638,8 @@ static int __wlan_hdd_cfg80211_disable_dfs_chan_scan(struct wiphy *wiphy,
 	int ret_val;
 	uint32_t no_dfs_flag = 0;
 
-	ENTER();
+	ENTER_DEV(dev);
+
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 
 	if (ret_val) {
@@ -2717,6 +2726,8 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy,
 	hdd_context_t *hdd_ctx_ptr;
 	int status;
 
+	ENTER_DEV(dev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -2806,6 +2817,8 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy,
 	int status;
 	struct sk_buff *reply_skb = NULL;
 
+	ENTER_DEV(wdev->netdev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -2903,6 +2916,8 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy,
 	uint32_t features;
 	struct sk_buff *reply_skb = NULL;
 
+	ENTER_DEV(wdev->netdev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -3141,6 +3156,8 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
 	u32 guard_time;
 	QDF_STATUS status;
 
+	ENTER_DEV(dev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -3260,6 +3277,8 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1];
 	struct sir_wifi_start_log start_log;
 
+	ENTER_DEV(wdev->netdev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -3384,6 +3403,8 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy,
 	struct nlattr *tb
 		[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_GET_RING_DATA_MAX + 1];
 
+	ENTER_DEV(wdev->netdev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -3776,7 +3797,7 @@ __wlan_hdd_cfg80211_offloaded_packets(struct wiphy *wiphy,
 			[PARAM_PERIOD] = { .type = NLA_U32 },
 	};
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3892,7 +3913,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy,
 			[PARAM_MAX_RSSI] = { .type = NLA_S8 },
 	};
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret)
@@ -4081,6 +4102,8 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST_MAX + 1];
 	struct sk_buff *reply_skb;
 
+	ENTER_DEV(wdev->netdev);
+
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
 		return -EINVAL;
@@ -4198,6 +4221,8 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST_MAX + 1];
 	uint32_t channel_hint;
 
+	ENTER_DEV(ndev);
+
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
 		return ret;
@@ -4329,7 +4354,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	uint8_t final_rate_flags = 0;
 	uint32_t freq;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -4514,6 +4539,8 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy,
 	QDF_STATUS status;
 	uint32_t current_roam_state;
 
+	ENTER_DEV(dev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
@@ -4620,6 +4647,8 @@ static int __wlan_hdd_cfg80211_txpower_scale(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TXPOWER_SCALE_MAX + 1];
 	uint8_t scale_value;
 
+	ENTER_DEV(dev);
+
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
 		return ret;
@@ -4700,6 +4729,8 @@ static int __wlan_hdd_cfg80211_txpower_scale_decr_db(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TXPOWER_SCALE_DECR_DB_MAX + 1];
 	uint8_t scale_value;
 
+	ENTER_DEV(dev);
+
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
 		return ret;

+ 14 - 14
core/hdd/src/wlan_hdd_ext_scan.c

@@ -1716,7 +1716,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
 			  1];
 	QDF_STATUS status;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1850,7 +1850,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy,
 	int retval = 0;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1998,7 +1998,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 	int rem, retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -2195,7 +2195,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy,
 	int rem, retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -2477,7 +2477,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
 	uint8_t i;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3142,7 +3142,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
 	int retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3352,7 +3352,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
 	int retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3479,7 +3479,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
 	int retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3604,7 +3604,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy
 	int retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3816,7 +3816,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
 	uint32_t num_networks, len;
 	int ret_val;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)
@@ -4022,7 +4022,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy,
 	uint32_t num_networks = 0;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -4138,7 +4138,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
 	QDF_STATUS status;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -4268,7 +4268,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy,
 	int retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -4488,7 +4488,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy,
 	int retval;
 	unsigned long rc;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");

+ 2 - 0
core/hdd/src/wlan_hdd_memdump.c

@@ -208,6 +208,8 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy,
 	unsigned long rc;
 	struct hdd_fw_dump_context *context;
 
+	ENTER_DEV(wdev->netdev);
+
 	status = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != status) {
 		hddLog(LOGE, FL("HDD context is invalid"));

+ 1 - 1
core/hdd/src/wlan_hdd_nan.c

@@ -62,7 +62,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy,
 	int ret_val;
 	hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	ENTER_DEV(wdev->netdev);
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)

+ 8 - 8
core/hdd/src/wlan_hdd_ocb.c

@@ -796,7 +796,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy,
 	int rc = -EINVAL;
 	uint8_t *mac_addr;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -991,7 +991,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy,
 	struct sir_ocb_utc *utc;
 	int rc = -EINVAL;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -1104,7 +1104,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
 	struct sir_ocb_timing_advert *timing_advert;
 	int rc = -EINVAL;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -1224,7 +1224,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy,
 	struct sir_ocb_timing_advert *timing_advert;
 	int rc = -EINVAL;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -1352,7 +1352,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 	struct sir_ocb_get_tsf_timer request = {0};
 	struct hdd_ocb_ctxt context = {0};
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -1542,7 +1542,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy,
 	struct sir_dcc_get_stats request = {0};
 	struct hdd_ocb_ctxt context = {0};
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -1709,7 +1709,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy,
 	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_MAX + 1];
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));
@@ -1830,7 +1830,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy,
 	int rc = -EINVAL;
 	struct hdd_ocb_ctxt context = {0};
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (wlan_hdd_validate_context(hdd_ctx)) {
 		hddLog(LOGE, FL("HDD context is not valid"));

+ 1 - 1
core/hdd/src/wlan_hdd_scan.c

@@ -1718,7 +1718,7 @@ static int __wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy,
 	hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
 	int ret;
 
-	ENTER();
+	ENTER_DEV(wdev->netdev);
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret)

+ 4 - 4
core/hdd/src/wlan_hdd_stats.c

@@ -1142,7 +1142,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
 	hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	hdd_context_t *pHddCtx = wiphy_priv(wiphy);
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1268,7 +1268,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
 	hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	int status;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1399,7 +1399,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 	int status;
 	struct sk_buff *temp_skbuff;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1540,7 +1540,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy,
 	QDF_STATUS status;
 	hdd_context_t *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)

+ 1 - 1
core/hdd/src/wlan_hdd_subnet_detect.c

@@ -80,7 +80,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy,
 	int ret;
 	QDF_STATUS status;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret)

+ 4 - 2
core/hdd/src/wlan_hdd_tdls.c

@@ -3062,7 +3062,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy,
 	uint32_t channel = 0;
 	struct sk_buff *skb = NULL;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3241,7 +3241,7 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy,
 	tdls_req_params_t pReqMsg = { 0 };
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -3362,6 +3362,8 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
 	struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1];
 	QDF_STATUS status;
 
+	ENTER_DEV(dev);
+
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;