diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index dea1ea3e3beab..6dc079bc407e9 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -717,7 +717,7 @@ static int __wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy, uint32_t set = 0; uint32_t max_num_tdls_sta = 0; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1454,7 +1454,7 @@ static int __is_driver_dfs_capable(struct wiphy *wiphy, int ret_val; struct hdd_context *hdd_ctx = wiphy_priv(wiphy); - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) @@ -2498,7 +2498,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, * config shall be set only from start_acs. */ - ENTER_DEV(ndev); + hdd_enter_dev(ndev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3146,7 +3146,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, struct net_device *ndev = wdev->netdev; struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3274,7 +3274,7 @@ static int __wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, struct hdd_context *hdd_ctx = wiphy_priv(wiphy); int ret; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3413,7 +3413,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, uint8_t feature_flags[(NUM_QCA_WLAN_VENDOR_FEATURES + 7) / 8] = {0}; struct hdd_context *hdd_ctx_ptr = wiphy_priv(wiphy); - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); ret_val = wlan_hdd_validate_context(hdd_ctx_ptr); if (ret_val) @@ -3996,7 +3996,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, struct roam_ext_params *roam_params = NULL; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -4271,7 +4271,7 @@ static int __wlan_hdd_cfg80211_disable_dfs_chan_scan(struct wiphy *wiphy, int ret_val; uint32_t no_dfs_flag = 0; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) @@ -4364,7 +4364,7 @@ static int __wlan_hdd_cfg80211_handle_wisa_cmd(struct wiphy *wiphy, void *soc = cds_get_context(QDF_MODULE_ID_SOC); void *pdev = cds_get_context(QDF_MODULE_ID_TXRX); - ENTER_DEV(dev); + hdd_enter_dev(dev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) goto err; @@ -5506,7 +5506,7 @@ __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_STATION_MAX + 1]; int32_t status; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); status = -EPERM; @@ -5646,7 +5646,7 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy, int status; struct pmkid_mode_bits pmkid_modes; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -5743,7 +5743,7 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy, struct sk_buff *reply_skb; uint32_t skb_len = 0, count = 0; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -5872,7 +5872,7 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy, uint32_t features; struct sk_buff *reply_skb = NULL; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -6681,7 +6681,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, uint8_t bmiss_bcnt; uint16_t latency_level; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -7288,7 +7288,7 @@ __wlan_hdd_cfg80211_set_wifi_test_config(struct wiphy *wiphy, uint8_t tid = 0, ac; uint16_t buff_size = 0; - ENTER_DEV(dev); + hdd_enter_dev(dev); sme_config = qdf_mem_malloc(sizeof(*sme_config)); if (!sme_config) { @@ -7525,7 +7525,7 @@ 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); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -7658,7 +7658,7 @@ 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); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -8058,7 +8058,7 @@ __wlan_hdd_cfg80211_offloaded_packets(struct wiphy *wiphy, [PARAM_PERIOD] = { .type = NLA_U32 }, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -8172,7 +8172,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, [PARAM_MAX_RSSI] = { .type = NLA_S8 }, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_session_id(adapter->session_id)) { hdd_err("invalid session id: %d", adapter->session_id); @@ -8363,7 +8363,7 @@ __wlan_hdd_cfg80211_set_ns_offload(struct wiphy *wiphy, struct net_device *dev = wdev->netdev; struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) @@ -8461,7 +8461,7 @@ 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); + hdd_enter_dev(wdev->netdev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -8592,7 +8592,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PROBABLE_OPER_CHANNEL_MAX + 1]; uint32_t channel_hint; - ENTER_DEV(ndev); + hdd_enter_dev(ndev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -8707,7 +8707,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, uint8_t final_rate_flags = 0; uint32_t freq; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -8898,7 +8898,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, QDF_STATUS status; uint32_t current_roam_state; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -9012,7 +9012,7 @@ static int __wlan_hdd_cfg80211_txpower_scale(struct wiphy *wiphy, uint8_t scale_value; QDF_STATUS status; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -9100,7 +9100,7 @@ static int __wlan_hdd_cfg80211_txpower_scale_decr_db(struct wiphy *wiphy, uint8_t scale_value; QDF_STATUS status; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -9186,7 +9186,7 @@ static int __wlan_hdd_cfg80211_conditional_chan_switch(struct wiphy *wiphy, uint32_t *freq; uint8_t chans[QDF_MAX_NUM_CHAN] = {0}; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -9318,7 +9318,7 @@ static int __wlan_hdd_cfg80211_p2p_lo_start(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_P2P_LISTEN_OFFLOAD_MAX + 1]; struct sir_p2p_lo_start params; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -10377,7 +10377,7 @@ __wlan_hdd_cfg80211_acs_dfs_mode(struct wiphy *wiphy, int mode = DFS_MODE_NONE; int channel_hint = 0; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -10542,7 +10542,7 @@ __wlan_hdd_cfg80211_sta_roam_policy(struct wiphy *wiphy, QDF_STATUS status; uint8_t sap_operating_band; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -10690,7 +10690,7 @@ __wlan_hdd_cfg80211_avoid_freq(struct wiphy *wiphy, struct ch_avoid_ind_type *channel_list; enum tQDF_GLOBAL_CON_MODE curr_mode; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (!qdf_ctx) { hdd_err("qdf_ctx is NULL"); @@ -12308,7 +12308,7 @@ static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy, unsigned long rc; struct hdd_station_ctx *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -21523,7 +21523,7 @@ static int __wlan_hdd_cfg80211_update_connect_params( QDF_STATUS status; struct cds_fils_connection_info *fils_info; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_session_id(adapter->session_id)) { hdd_err("invalid session id: %d", adapter->session_id); diff --git a/core/hdd/src/wlan_hdd_disa.c b/core/hdd/src/wlan_hdd_disa.c index 00e8e64436f7e..9ef943d0c794c 100644 --- a/core/hdd/src/wlan_hdd_disa.c +++ b/core/hdd/src/wlan_hdd_disa.c @@ -436,7 +436,7 @@ static int __wlan_hdd_cfg80211_encrypt_decrypt_msg(struct wiphy *wiphy, struct hdd_adapter *adapter = NULL; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index 3a8618af69014..34662b55c4c9e 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -1638,7 +1638,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, 1]; QDF_STATUS status; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1931,7 +1931,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, int rem, retval; unsigned long rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -2153,7 +2153,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, int rem, retval; unsigned long rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3137,7 +3137,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3356,7 +3356,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3486,7 +3486,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3615,7 +3615,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy int retval; unsigned long rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3844,7 +3844,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, uint32_t num_networks, len; int ret_val; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) @@ -4153,7 +4153,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, uint32_t num_networks = 0; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -4274,7 +4274,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, QDF_STATUS status; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) diff --git a/core/hdd/src/wlan_hdd_fips.c b/core/hdd/src/wlan_hdd_fips.c index d5d58f9033a3b..367ac0356382e 100644 --- a/core/hdd/src/wlan_hdd_fips.c +++ b/core/hdd/src/wlan_hdd_fips.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -187,7 +187,7 @@ static int __hdd_fips_test(struct net_device *dev, .dealloc = hdd_fips_context_dealloc, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 34e9e25b43600..d56a7c67bcd72 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -429,7 +429,7 @@ static int __hdd_hostapd_open(struct net_device *dev) struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); @@ -505,7 +505,7 @@ static int __hdd_hostapd_stop(struct net_device *dev) struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) return ret; @@ -568,7 +568,7 @@ static void __hdd_hostapd_uninit(struct net_device *dev) struct hdd_adapter *adapter = netdev_priv(dev); struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hdd_err("Invalid magic"); @@ -612,7 +612,7 @@ static void hdd_hostapd_uninit(struct net_device *dev) */ static int __hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu) { - ENTER_DEV(dev); + hdd_enter_dev(dev); return 0; } @@ -680,7 +680,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) int ret = 0; struct qdf_mac_addr mac_addr; - ENTER_DEV(dev); + hdd_enter_dev(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -759,7 +759,7 @@ static void hdd_hostapd_inactivity_timer_cb(void *context) /* For the NULL at the end */ int event_len = strlen(autoShutEvent) + 1; - ENTER_DEV(dev); + hdd_enter_dev(dev); #ifdef DISABLE_CONCURRENCY_AUTOSAVE hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -828,7 +828,7 @@ static void hdd_clear_all_sta(struct hdd_adapter *adapter) { uint8_t sta_id; - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) hdd_clear_sta(adapter, sta_id); } @@ -1053,7 +1053,7 @@ static void hdd_send_conditional_chan_switch_status(struct hdd_context *hdd_ctx, { struct sk_buff *event; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); if (!hdd_ctx) { hdd_err("Invalid HDD context pointer"); @@ -3044,7 +3044,7 @@ static int __iw_softap_set_ini_cfg(struct net_device *dev, char *value; size_t len; - ENTER_DEV(dev); + hdd_enter_dev(dev); adapter = netdev_priv(dev); errno = hdd_validate_adapter(adapter); @@ -3120,7 +3120,7 @@ static __iw_softap_get_ini_cfg(struct net_device *dev, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3171,7 +3171,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev, int sub_cmd = value[0]; struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3340,7 +3340,7 @@ static __iw_softap_setparam(struct net_device *dev, void *soc = NULL; struct cdp_txrx_stats_req req; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4118,7 +4118,7 @@ static __iw_softap_getparam(struct net_device *dev, int ret; struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4398,7 +4398,7 @@ int __iw_softap_modify_acl(struct net_device *dev, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4454,7 +4454,7 @@ static __iw_softap_getchannel(struct net_device *dev, int *value = (int *)extra; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4501,7 +4501,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev, struct qdf_mac_addr bssid = QDF_MAC_ADDR_BCAST_INIT; struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BCAST_INIT; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (NULL == value) return -ENOMEM; @@ -4553,7 +4553,7 @@ static __iw_softap_set_pktlog(struct net_device *dev, int *value = (int *)extra; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = hdd_check_private_wext_control(hdd_ctx, info); @@ -4596,7 +4596,7 @@ static __iw_softap_set_tx_power(struct net_device *dev, struct qdf_mac_addr bssid; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4651,7 +4651,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev, /* maclist_index must be u32 to match userspace */ u32 maclist_index; - ENTER_DEV(dev); + hdd_enter_dev(dev); /* * NOTE WELL: this is a "get" ioctl but it uses an even ioctl @@ -4756,7 +4756,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev, int ret; struct csr_del_sta_params del_sta_params; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (!capable(CAP_NET_ADMIN)) { hdd_err("permission check failed"); @@ -4821,7 +4821,7 @@ static int __iw_get_char_setnone(struct net_device *dev, int sub_cmd = wrqu->data.flags; struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4869,7 +4869,7 @@ static int wlan_hdd_set_force_acs_ch_range(struct net_device *dev, int ret; int *value = (int *)extra; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (!capable(CAP_NET_ADMIN)) { hdd_err("permission check failed"); @@ -4928,7 +4928,7 @@ static int __iw_get_channel_list(struct net_device *dev, int ret; bool is_dfs_mode_enabled = false; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(hostapd_adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5018,7 +5018,7 @@ int __iw_get_genie(struct net_device *dev, uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5088,7 +5088,7 @@ static int __iw_get_ap_freq(struct net_device *dev, struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5167,7 +5167,7 @@ __iw_softap_stopbss(struct net_device *dev, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5229,7 +5229,7 @@ __iw_softap_version(struct net_device *dev, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5309,7 +5309,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev, struct hdd_adapter *adapter; struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); adapter = netdev_priv(dev); errno = hdd_validate_adapter(adapter); @@ -5367,7 +5367,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, QDF_STATUS status = QDF_STATUS_E_FAILURE; int rc, ret, i; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -6371,7 +6371,7 @@ void hdd_deinit_ap_mode(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter, bool rtnl_held) { - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) { hdd_wmm_adapter_close(adapter); diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index f3b5276204c05..08c087da0381a 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -7058,7 +7058,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (dev != adapter->dev) { hdd_err("HDD adapter/dev inconsistency"); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b68287f5ef622..4700a3642082d 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -554,7 +554,7 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb, struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); /* Make sure that this callback corresponds to our device. */ if ((strncmp(dev->name, "wlan", 4)) && (strncmp(dev->name, "p2p", 3))) @@ -2126,7 +2126,7 @@ static int __hdd_mon_open(struct net_device *dev) struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -2196,7 +2196,7 @@ int hdd_start_adapter(struct hdd_adapter *adapter) int ret; enum QDF_OPMODE device_mode = adapter->device_mode; - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); hdd_debug("Start_adapter for mode : %d", adapter->device_mode); switch (device_mode) { @@ -2824,7 +2824,7 @@ static int __hdd_open(struct net_device *dev) struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, adapter->session_id, adapter->device_mode)); @@ -2936,7 +2936,7 @@ static int __hdd_stop(struct net_device *dev) struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, adapter->session_id, adapter->device_mode)); @@ -3056,7 +3056,7 @@ static void __hdd_uninit(struct net_device *dev) struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); do { if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { @@ -3156,7 +3156,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) int ret; struct qdf_mac_addr mac_addr; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3260,7 +3260,7 @@ static void __hdd_set_multicast_list(struct net_device *dev) struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc; int mc_count = 0; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) goto out; @@ -3930,7 +3930,7 @@ static void hdd_deinit_station_mode(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter, bool rtnl_held) { - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); if (adapter->dev) { if (rtnl_held) @@ -4255,7 +4255,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter) int ret; struct hdd_context *hdd_ctx; - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) @@ -8586,7 +8586,7 @@ int hdd_start_station_adapter(struct hdd_adapter *adapter) QDF_STATUS status; int ret; - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); if (test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { hdd_err("session is already opened, %d", adapter->session_id); diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c index d2c0cdfd5da14..e46a17e51689e 100644 --- a/core/hdd/src/wlan_hdd_nan.c +++ b/core/hdd/src/wlan_hdd_nan.c @@ -1,9 +1,8 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * - * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the * above copyright notice and this permission notice appear in all @@ -60,7 +59,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, int ret_val; struct hdd_context *hdd_ctx = wiphy_priv(wiphy); - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index f6c239ab43a88..d9f0cc5826fe5 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -482,7 +482,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, int i, j; struct ocb_config_chan *curr_chan; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); rc = wlan_hdd_validate_context(hdd_ctx); @@ -795,7 +795,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, int rc = -EINVAL; uint8_t *mac_addr; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -988,7 +988,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, struct ocb_utc_param *utc; int rc = -EINVAL; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -1101,7 +1101,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, struct ocb_timing_advert_param *timing_advert; int rc = -EINVAL; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -1218,7 +1218,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, struct ocb_timing_advert_param *timing_advert; int rc = -EINVAL; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -1399,7 +1399,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy, .timeout_ms = WLAN_WAIT_TIME_OCB_CMD, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); rc = wlan_hdd_validate_context(hdd_ctx); if (rc) @@ -1622,7 +1622,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, .dealloc = hdd_dcc_get_stats_dealloc, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); rc = wlan_hdd_validate_context(hdd_ctx); if (rc) @@ -1752,7 +1752,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy, struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_MAX + 1]; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (wlan_hdd_validate_context(hdd_ctx)) return -EINVAL; @@ -1881,7 +1881,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, .timeout_ms = WLAN_WAIT_TIME_OCB_CMD, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); rc = wlan_hdd_validate_context(hdd_ctx); if (rc) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index cc89100ad83e1..4296332c79fc6 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -205,7 +205,7 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb, struct hdd_context *hdd_ctx; int errno; - ENTER_DEV(ndev); + hdd_enter_dev(ndev); errno = hdd_validate_adapter(adapter); if (errno) @@ -798,7 +798,7 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb, struct hdd_context *hdd_ctx; int errno; - ENTER_DEV(ndev); + hdd_enter_dev(ndev); errno = hdd_validate_adapter(adapter); if (errno) diff --git a/core/hdd/src/wlan_hdd_rx_monitor.c b/core/hdd/src/wlan_hdd_rx_monitor.c index 248073c8f75d9..2de4050e95335 100644 --- a/core/hdd/src/wlan_hdd_rx_monitor.c +++ b/core/hdd/src/wlan_hdd_rx_monitor.c @@ -1,9 +1,8 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * - * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the * above copyright notice and this permission notice appear in all @@ -131,7 +130,7 @@ int hdd_enable_monitor_mode(struct net_device *dev) void *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER_DEV(dev); + hdd_enter_dev(dev); return cdp_set_monitor_mode(soc, (struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc, diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 483e9bacad52d..42cb01edecf92 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -910,7 +910,7 @@ static int __wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(wdev->netdev); int ret; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -1299,7 +1299,7 @@ int wlan_hdd_sched_scan_stop(struct net_device *dev) struct hdd_context *hdd_ctx; tHalHandle hHal; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1345,7 +1345,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct net_device *dev) { int err; - ENTER_DEV(dev); + hdd_enter_dev(dev); /* The return 0 is intentional when Recovery and Load/Unload in * progress. We did observe a crash due to a return of @@ -1422,7 +1422,7 @@ static void __wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy, struct hdd_context *hdd_ctx = wiphy_priv(wiphy); int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index af2812d1dd2a5..98a788a4f85c7 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -1081,7 +1081,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter, uint8_t sta_id = WLAN_MAX_STA_COUNT; QDF_STATUS qdf_status; - ENTER_DEV(adapter->dev); + hdd_enter_dev(adapter->dev); qdf_status = hdd_softap_get_sta_id(adapter, pDestMacAddress, &sta_id); if (QDF_STATUS_SUCCESS != qdf_status) { diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 6a93eecaa0f78..99b1a0ac0a6eb 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -1205,7 +1205,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx = wiphy_priv(wiphy); - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1524,7 +1524,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, int status; struct sk_buff *temp_skbuff; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -2454,7 +2454,7 @@ static int __wlan_hdd_cfg80211_ll_stats_ext_set_param(struct wiphy *wiphy, struct sir_ll_ext_stats_threshold thresh = {0,}; struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_LL_STATS_EXT_MAX + 1]; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_warn("command not allowed in ftm mode"); @@ -2794,7 +2794,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, QDF_STATUS status; struct hdd_context *hdd_ctx = wiphy_priv(wiphy); - ENTER_DEV(dev); + hdd_enter_dev(dev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) @@ -3925,7 +3925,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, enum data_rate_11ac_max_mcs vht_max_mcs; int32_t rcpi_value; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -4496,7 +4496,7 @@ struct net_device_stats *hdd_get_stats(struct net_device *dev) { struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER_DEV(dev); + hdd_enter_dev(dev); return &adapter->stats; } @@ -4625,7 +4625,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, int status; bool filled = false; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_debug("dump survey index: %d", idx); if (idx > QDF_MAX_NUM_CHAN - 1) diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 2f17e1184d529..08f9d10453fee 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -81,7 +81,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, int ret; QDF_STATUS status; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 730cd274bf37f..42d5e04ee4e90 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -213,7 +213,7 @@ __wlan_hdd_cfg80211_configure_tdls_mode(struct wiphy *wiphy, int ret; uint32_t trigger_mode; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); diff --git a/core/hdd/src/wlan_hdd_tsf.c b/core/hdd/src/wlan_hdd_tsf.c index 63a291b4be1c2..cecce6da2ab07 100644 --- a/core/hdd/src/wlan_hdd_tsf.c +++ b/core/hdd/src/wlan_hdd_tsf.c @@ -1139,7 +1139,7 @@ static int __wlan_hdd_cfg80211_handle_tsf_cmd(struct wiphy *wiphy, struct sk_buff *reply_skb; uint32_t tsf_op_resp[3], tsf_cmd; - ENTER_DEV(wdev->netdev); + hdd_enter_dev(wdev->netdev); status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 1f7ba2e7f9a71..ce48ec847bae5 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -4475,7 +4475,7 @@ static int __iw_set_commit(struct net_device *dev, struct iw_request_info *info, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -4528,7 +4528,7 @@ static int __iw_get_name(struct net_device *dev, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -4594,7 +4594,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4991,7 +4991,7 @@ static int __iw_get_linkspeed(struct net_device *dev, int ret; int rc; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5528,7 +5528,7 @@ static int __iw_setint_getnone(struct net_device *dev, struct cdp_vdev *vdev = NULL; struct cdp_txrx_stats_req req; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -6776,7 +6776,7 @@ static int __iw_setnone_get_threeint(struct net_device *dev, struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; @@ -6842,7 +6842,7 @@ 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); + hdd_enter_dev(dev); if (!capable(CAP_NET_ADMIN)) { hdd_err("permission check failed"); @@ -6987,7 +6987,7 @@ static int __iw_setnone_getint(struct net_device *dev, tSmeConfigParams *sme_config; struct hdd_context *hdd_ctx; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -7556,7 +7556,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, int ret; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - ENTER_DEV(dev); + hdd_enter_dev(dev); if (!capable(CAP_NET_ADMIN)) { hdd_err("permission check failed"); @@ -7721,7 +7721,7 @@ static int __iw_get_char_setnone(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); #endif - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8288,7 +8288,7 @@ static int __iw_setnone_getnone(struct net_device *dev, int ret; int sub_cmd; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8643,7 +8643,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, struct hdd_context *hdd_ctx; int ret, num_args; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8965,7 +8965,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9139,7 +9139,7 @@ static int __iw_del_tspec(struct net_device *dev, struct iw_request_info *info, uint32_t handle; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9206,7 +9206,7 @@ static int __iw_get_tspec(struct net_device *dev, struct iw_request_info *info, uint32_t handle; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9268,7 +9268,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9362,7 +9362,7 @@ static int __iw_set_host_offload(struct net_device *dev, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9474,7 +9474,7 @@ static int __iw_set_keepalive_params(struct net_device *dev, struct hdd_context *hdd_ctx; int ret; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9741,7 +9741,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev, return -EPERM; } - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9888,7 +9888,7 @@ static int __iw_get_statistics(struct net_device *dev, .timeout_ms = WLAN_WAIT_TIME_STATS, }; - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -10155,7 +10155,7 @@ static int __iw_set_pno(struct net_device *dev, */ static struct pno_scan_req_params req; - ENTER_DEV(dev); + hdd_enter_dev(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -10528,7 +10528,7 @@ static int __iw_set_band_config(struct net_device *dev, int ret; int *value = (int *)extra; - ENTER_DEV(dev); + hdd_enter_dev(dev); if (!capable(CAP_NET_ADMIN)) { hdd_err("permission check failed"); @@ -10666,7 +10666,7 @@ static int __iw_set_two_ints_getnone(struct net_device *dev, int ret; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - ENTER_DEV(dev); + hdd_enter_dev(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret)