From 3c3994a8bef11df1aa89782bcafc79ad057acf37 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 08:12:30 -0800 Subject: [PATCH] qcacld-3.0: Use ENTER_DEV() in control plane netdev ops The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all control plane netdev methods to use this macro. Change-Id: Id73214481616eb34cc40f125ea7fb756b3097dc7 CRs-Fixed: 938146 --- core/hdd/src/wlan_hdd_hostapd.c | 13 ++++++++----- core/hdd/src/wlan_hdd_ioctl.c | 2 +- core/hdd/src/wlan_hdd_main.c | 16 +++++++++------- core/hdd/src/wlan_hdd_stats.c | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index f0c503683489..a93978b50ce1 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -218,7 +218,7 @@ static int __hdd_hostapd_open(struct net_device *dev) { hdd_adapter_t *pAdapter = netdev_priv(dev); - ENTER(); + ENTER_DEV(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); @@ -267,7 +267,8 @@ static int hdd_hostapd_open(struct net_device *dev) static int __hdd_hostapd_stop(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER(); + + ENTER_DEV(dev); /* Stop all tx queues */ hddLog(LOG1, FL("Disabling queues")); @@ -311,7 +312,7 @@ static void __hdd_hostapd_uninit(struct net_device *dev) hdd_adapter_t *adapter = netdev_priv(dev); hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hddLog(LOGE, FL("Invalid magic")); @@ -355,6 +356,8 @@ 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); + return 0; } @@ -420,7 +423,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) hdd_context_t *hdd_ctx; int ret = 0; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -470,7 +473,7 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) /* For the NULL at the end */ int event_len = strlen(autoShutEvent) + 1; - ENTER(); + ENTER_DEV(dev); #ifdef DISABLE_CONCURRENCY_AUTOSAVE if (cds_concurrent_open_sessions_running()) { diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index d2c14590e8fd..25882c73105c 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -6357,7 +6357,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); if (dev != adapter->dev) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index e2c3b0ad3320..2a98cf201537 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -91,8 +91,6 @@ #include "wlan_hdd_ocb.h" #include "cdp_txrx_flow_ctrl_v2.h" - -extern int hdd_hostapd_stop(struct net_device *dev); #endif /* FEATURE_WLAN_CH_AVOID */ #include "wlan_hdd_nan.h" @@ -318,6 +316,8 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; + ENTER_DEV(dev); + /* Make sure that this callback corresponds to our device. */ if ((strncmp(dev->name, "wlan", 4)) && (strncmp(dev->name, "p2p", 3))) return NOTIFY_DONE; @@ -1443,6 +1443,8 @@ static int __hdd_open(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; + ENTER_DEV(dev); + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, adapter->sessionId, adapter->device_mode)); @@ -1497,7 +1499,7 @@ static int __hdd_stop(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - ENTER(); + ENTER_DEV(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, adapter->sessionId, adapter->device_mode)); @@ -1576,7 +1578,7 @@ static void __hdd_uninit(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER(); + ENTER_DEV(dev); do { if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { @@ -1641,7 +1643,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1726,11 +1728,11 @@ static void __hdd_set_multicast_list(struct net_device *dev) static const uint8_t ipv6_router_solicitation[] = {0x33, 0x33, 0x00, 0x00, 0x00, 0x02}; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; - ENTER(); - status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) return; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 0ae9540a7d59..c102b8809743 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -2209,6 +2209,7 @@ struct net_device_stats *hdd_get_stats(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); + ENTER_DEV(dev); return &adapter->stats; } /**