diff --git a/Kbuild b/Kbuild index 05a860dfcb42..cac2d9e6ede9 100644 --- a/Kbuild +++ b/Kbuild @@ -340,8 +340,8 @@ endif ifeq ($(CONFIG_WLAN_GET_RANGE_EXT), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_range_ext.o endif -ifeq ($(CONFIG_WLAN_GET_TDLS_PEERS), y) -HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_tdls_peers.o +ifeq ($(CONFIG_WLAN_SYSFS_TDLS_PEERS), y) +HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_tdls_peers.o endif ifeq ($(CONFIG_WLAN_SYSFS_TEMPERATURE), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_temperature.o @@ -2697,7 +2697,7 @@ ifeq ($(CONFIG_LITHIUM), y) cppflags-$(CONFIG_QCOM_TDLS) += -DTDLS_WOW_ENABLED endif -cppflags-$(CONFIG_WLAN_GET_TDLS_PEERS) += -DWLAN_GET_TDLS_PEERS +cppflags-$(CONFIG_WLAN_SYSFS_TDLS_PEERS) += -DWLAN_SYSFS_TDLS_PEERS cppflags-$(CONFIG_WLAN_SET_RANGE_EXT) += -DWLAN_SET_RANGE_EXT ifeq ($(CONFIG_CM_ENABLE), y) diff --git a/configs/default_defconfig b/configs/default_defconfig index 240638d25d67..9bc0c734c80e 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -222,7 +222,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y) CONFIG_WLAN_SYSFS_STATS := y CONFIG_WLAN_GET_RANGE_EXT := y ifeq ($(CONFIG_QCOM_TDLS), y) - CONFIG_WLAN_GET_TDLS_PEERS := y + CONFIG_WLAN_SYSFS_TDLS_PEERS := y endif CONFIG_WLAN_SYSFS_TEMPERATURE := y CONFIG_WLAN_THERMAL_CFG := y diff --git a/core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h b/core/hdd/inc/wlan_hdd_sysfs_tdls_peers.h similarity index 61% rename from core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h rename to core/hdd/inc/wlan_hdd_sysfs_tdls_peers.h index 2aa9fdc7b52b..499772b9b4ed 100644 --- a/core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h +++ b/core/hdd/inc/wlan_hdd_sysfs_tdls_peers.h @@ -15,17 +15,17 @@ */ /** - * DOC: wlan_hdd_sysfs_get_tdls_peers.h + * DOC: wlan_hdd_sysfs_tdls_peers.h * - * implementation for creating sysfs file get TDLS peers + * Implementation for creating sysfs file tdls_peers */ -#ifndef _WLAN_HDD_SYSFS_GET_TDLS_PEERS_H -#define _WLAN_HDD_SYSFS_GET_TDLS_PEERS_H +#ifndef _WLAN_HDD_SYSFS_TDLS_PEERS_H +#define _WLAN_HDD_SYSFS_TDLS_PEERS_H -#if defined(WLAN_SYSFS) && defined(WLAN_GET_TDLS_PEERS) +#if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_TDLS_PEERS) /** - * hdd_sysfs_get_tdls_peers_interface_create() - API to create tdls_peers + * hdd_sysfs_tdls_peers_interface_create() - API to create tdls_peers * sysfs interface * @adapter: pointer to adapter * @@ -38,26 +38,26 @@ * * Return: none */ -void hdd_sysfs_get_tdls_peers_interface_create(struct hdd_adapter *adapter); +void hdd_sysfs_tdls_peers_interface_create(struct hdd_adapter *adapter); /** - * hdd_sysfs_get_tdls_peers_interface_destroy() - API to destroy tdls_peers + * hdd_sysfs_tdls_peers_interface_destroy() - API to destroy tdls_peers * sysfs interface * @adapter: pointer to adapter * * Return: none */ -void hdd_sysfs_get_tdls_peers_interface_destroy(struct hdd_adapter *adapter); +void hdd_sysfs_tdls_peers_interface_destroy(struct hdd_adapter *adapter); #else static inline -void hdd_sysfs_get_tdls_peers_interface_create(struct hdd_adapter *adapter) +void hdd_sysfs_tdls_peers_interface_create(struct hdd_adapter *adapter) { } static inline -void hdd_sysfs_get_tdls_peers_interface_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_tdls_peers_interface_destroy(struct hdd_adapter *adapter) { } #endif -#endif /* #ifndef _WLAN_HDD_SYSFS_GET_TDLS_PEERS_H */ +#endif /* #ifndef _WLAN_HDD_SYSFS_TDLS_PEERS_H */ diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c index 84d9a3740530..caae4bfc792c 100644 --- a/core/hdd/src/wlan_hdd_sysfs.c +++ b/core/hdd/src/wlan_hdd_sysfs.c @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include @@ -665,7 +665,7 @@ hdd_sysfs_create_sta_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_txrx_fw_stats_create(adapter); hdd_sysfs_txrx_stats_create(adapter); hdd_sysfs_get_range_ext_create(adapter); - hdd_sysfs_get_tdls_peers_interface_create(adapter); + hdd_sysfs_tdls_peers_interface_create(adapter); hdd_sysfs_temperature_create(adapter); hdd_sysfs_motion_detection_create(adapter); hdd_sysfs_range_ext_create(adapter); @@ -677,7 +677,7 @@ hdd_sysfs_destroy_sta_adapter_root_obj(struct hdd_adapter *adapter) hdd_sysfs_range_ext_destroy(adapter); hdd_sysfs_motion_detection_destroy(adapter); hdd_sysfs_temperature_destroy(adapter); - hdd_sysfs_get_tdls_peers_interface_destroy(adapter); + hdd_sysfs_tdls_peers_interface_destroy(adapter); hdd_sysfs_get_range_ext_destroy(adapter); hdd_sysfs_txrx_stats_destroy(adapter); hdd_sysfs_txrx_fw_stats_destroy(adapter); diff --git a/core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c b/core/hdd/src/wlan_hdd_sysfs_tdls_peers.c similarity index 91% rename from core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c rename to core/hdd/src/wlan_hdd_sysfs_tdls_peers.c index f5d44880311c..9eace5f21aa5 100644 --- a/core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c +++ b/core/hdd/src/wlan_hdd_sysfs_tdls_peers.c @@ -15,15 +15,15 @@ */ /** - * DOC: wlan_hdd_sysfs_get_tdls_peers.c + * DOC: wlan_hdd_sysfs_tdls_peers.c * - * implementation for creating sysfs file tdls_peers + * Implementation for creating sysfs file tdls_peers */ #include #include "osif_vdev_sync.h" #include "wlan_hdd_object_manager.h" -#include "wlan_hdd_sysfs_get_tdls_peers.h" +#include "wlan_hdd_sysfs_tdls_peers.h" /** * __show_tdls_all_peers() - dump all TDLS peer info into output string @@ -102,7 +102,7 @@ static ssize_t show_tdls_all_peers(struct device *dev, static DEVICE_ATTR(tdls_peers, 0444, show_tdls_all_peers, NULL); -void hdd_sysfs_get_tdls_peers_interface_create(struct hdd_adapter *adapter) +void hdd_sysfs_tdls_peers_interface_create(struct hdd_adapter *adapter) { int error; @@ -112,7 +112,7 @@ void hdd_sysfs_get_tdls_peers_interface_create(struct hdd_adapter *adapter) hdd_err("could not create tdls_peers sysfs file"); } -void hdd_sysfs_get_tdls_peers_interface_destroy(struct hdd_adapter *adapter) +void hdd_sysfs_tdls_peers_interface_destroy(struct hdd_adapter *adapter) { device_remove_file(&adapter->dev->dev, &dev_attr_tdls_peers); }