diff --git a/Kbuild b/Kbuild index c016431d4e7d..05a860dfcb42 100644 --- a/Kbuild +++ b/Kbuild @@ -269,8 +269,8 @@ endif ifeq ($(CONFIG_WLAN_REASSOC), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_reassoc.o endif -ifeq ($(CONFIG_WLAN_SYSFS_GET_STA_INFO), y) -HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_sta_info.o +ifeq ($(CONFIG_WLAN_SYSFS_STA_INFO), y) +HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_sta_info.o endif ifeq ($(CONFIG_WLAN_DEBUG_CRASH_INJECT), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_crash_inject.o @@ -2665,7 +2665,7 @@ cppflags-$(CONFIG_FEATURE_WLM_STATS) += -DFEATURE_WLM_STATS cppflags-$(CONFIG_WLAN_SYSFS_MEM_STATS) += -DCONFIG_WLAN_SYSFS_MEM_STATS cppflags-$(CONFIG_WLAN_SYSFS_DCM) += -DWLAN_SYSFS_DCM cppflags-$(CONFIG_WLAN_SYSFS_HE_BSS_COLOR) += -DWLAN_SYSFS_HE_BSS_COLOR -cppflags-$(CONFIG_WLAN_SYSFS_GET_STA_INFO) += -DWLAN_SYSFS_GET_STA_INFO +cppflags-$(CONFIG_WLAN_SYSFS_STA_INFO) += -DWLAN_SYSFS_STA_INFO ifeq ($(CONFIG_LEAK_DETECTION), y) cppflags-y += \ diff --git a/configs/default_defconfig b/configs/default_defconfig index 3cf87d43bda9..240638d25d67 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -195,7 +195,7 @@ CONFIG_QCOM_TDLS := y CONFIG_WLAN_SYSFS := y ifeq ($(CONFIG_WLAN_SYSFS), y) - CONFIG_WLAN_SYSFS_GET_STA_INFO := y + CONFIG_WLAN_SYSFS_STA_INFO := y CONFIG_WLAN_SYSFS_CHANNEL := y CONFIG_WLAN_SET_FW_MODE_CFG := y CONFIG_WLAN_SYSFS_MEM_STATS := y diff --git a/core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h b/core/hdd/inc/wlan_hdd_sysfs_sta_info.h similarity index 64% rename from core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h rename to core/hdd/inc/wlan_hdd_sysfs_sta_info.h index 567306c3dc89..01ebfc89ec6e 100644 --- a/core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h +++ b/core/hdd/inc/wlan_hdd_sysfs_sta_info.h @@ -15,17 +15,17 @@ */ /** - * DOC: wlan_hdd_sysfs_get_sta_info.h + * DOC: wlan_hdd_sysfs_sta_info.h * * implementation for creating sysfs file sta_info */ -#ifndef _WLAN_HDD_SYSFS_GET_STA_INFO_H -#define _WLAN_HDD_SYSFS_GET_STA_INFO_H +#ifndef _WLAN_HDD_SYSFS_STA_INFO_H +#define _WLAN_HDD_SYSFS_STA_INFO_H -#if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_GET_STA_INFO) +#if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_STA_INFO) /** - * hdd_sysfs_get_sta_info_interface_create() - API to create sta_info sysfs + * hdd_sysfs_sta_info_interface_create() - API to create sta_info sysfs * interface * @adapter: pointer to adapter * @@ -38,25 +38,25 @@ * * Return: none */ -void hdd_sysfs_get_sta_info_interface_create(struct hdd_adapter *adapter); +void hdd_sysfs_sta_info_interface_create(struct hdd_adapter *adapter); /** - * hdd_sysfs_get_sta_info_interface_destroy() - API to destroy sta_info + * hdd_sysfs_sta_info_interface_destroy() - API to destroy sta_info * @adapter: pointer to adapter * * Return: none */ -void hdd_sysfs_get_sta_info_interface_destroy(struct hdd_adapter *adapter); +void hdd_sysfs_sta_info_interface_destroy(struct hdd_adapter *adapter); #else static inline -void hdd_sysfs_get_sta_info_interface_create(struct hdd_adapter *adapter) +void hdd_sysfs_sta_info_interface_create(struct hdd_adapter *adapter) { } static inline -void hdd_sysfs_get_sta_info_interface_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_sta_info_interface_destroy(struct hdd_adapter *adapter) { } #endif -#endif /* #ifndef _WLAN_HDD_SYSFS_GET_STA_INFO_H */ +#endif /* #ifndef _WLAN_HDD_SYSFS_STA_INFO_H */ diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c index 5f8c68ab84ff..84d9a3740530 100644 --- a/core/hdd/src/wlan_hdd_sysfs.c +++ b/core/hdd/src/wlan_hdd_sysfs.c @@ -37,7 +37,7 @@ #include #endif #include "osif_sync.h" -#include "wlan_hdd_sysfs_get_sta_info.h" +#include "wlan_hdd_sysfs_sta_info.h" #include "wlan_hdd_sysfs_channel.h" #include #include @@ -703,7 +703,7 @@ static void hdd_sysfs_create_sap_adapter_root_obj(struct hdd_adapter *adapter) { hdd_sysfs_channel_interface_create(adapter); - hdd_sysfs_get_sta_info_interface_create(adapter); + hdd_sysfs_sta_info_interface_create(adapter); hdd_sysfs_crash_inject_create(adapter); hdd_sysfs_suspend_create(adapter); hdd_sysfs_resume_create(adapter); @@ -749,7 +749,7 @@ hdd_sysfs_destroy_sap_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_resume_destroy(adapter); hdd_sysfs_suspend_destroy(adapter); hdd_sysfs_crash_inject_destroy(adapter); - hdd_sysfs_get_sta_info_interface_destroy(adapter); + hdd_sysfs_sta_info_interface_destroy(adapter); hdd_sysfs_channel_interface_destroy(adapter); } diff --git a/core/hdd/src/wlan_hdd_sysfs_get_sta_info.c b/core/hdd/src/wlan_hdd_sysfs_sta_info.c similarity index 92% rename from core/hdd/src/wlan_hdd_sysfs_get_sta_info.c rename to core/hdd/src/wlan_hdd_sysfs_sta_info.c index c16c9744f1b5..be151ade066c 100644 --- a/core/hdd/src/wlan_hdd_sysfs_get_sta_info.c +++ b/core/hdd/src/wlan_hdd_sysfs_sta_info.c @@ -15,14 +15,14 @@ */ /** - * DOC: wlan_hdd_sysfs_get_sta_info.c + * DOC: wlan_hdd_sysfs_sta_info.c * * implementation for creating sysfs file sta_info */ #include #include "osif_vdev_sync.h" -#include "wlan_hdd_sysfs_get_sta_info.h" +#include "wlan_hdd_sysfs_sta_info.h" static ssize_t __show_sta_info(struct net_device *net_dev, char *buf) { @@ -94,7 +94,7 @@ static ssize_t show_sta_info(struct device *dev, static DEVICE_ATTR(sta_info, 0444, show_sta_info, NULL); -void hdd_sysfs_get_sta_info_interface_create(struct hdd_adapter *adapter) +void hdd_sysfs_sta_info_interface_create(struct hdd_adapter *adapter) { int error; @@ -103,7 +103,7 @@ void hdd_sysfs_get_sta_info_interface_create(struct hdd_adapter *adapter) hdd_err("Could not create sta_info sysfs file"); } -void hdd_sysfs_get_sta_info_interface_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_sta_info_interface_destroy(struct hdd_adapter *adapter) { device_remove_file(&adapter->dev->dev, &dev_attr_sta_info); }