android/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Define macro WLAN_SYSFS for feature sysfs interface

Browse Source 
Disable this feature for MOBILE_ROUTER product, since some MOBILE_ROUTER
platform will attach two wlan cards with separate wlan driver,
during second driver loading process, it will report a warning of
"cannot create duplicate filename" as node with same name has been
created after first driver was loaded.

Change-Id: I9e06439b3a6dacdf4eb5ae87898338ab1eeb8b16
CRs-Fixed: 2295391
This commit is contained in:
Kai Liu 2018-08-13 11:30:11 +08:00 committed by nshrivas
parent 50fdbbd9f3
commit aa88d2f9c2
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Kbuild
View File

@ -56,7 +56,6 @@ HDD_OBJS := $(HDD_SRC_DIR)/wlan_hdd_assoc.o \
$(HDD_SRC_DIR)/wlan_hdd_scan.o \ $(HDD_SRC_DIR)/wlan_hdd_scan.o \
$(HDD_SRC_DIR)/wlan_hdd_softap_tx_rx.o \ $(HDD_SRC_DIR)/wlan_hdd_softap_tx_rx.o \
$(HDD_SRC_DIR)/wlan_hdd_stats.o \ $(HDD_SRC_DIR)/wlan_hdd_stats.o \
$(HDD_SRC_DIR)/wlan_hdd_sysfs.o \
$(HDD_SRC_DIR)/wlan_hdd_trace.o \ $(HDD_SRC_DIR)/wlan_hdd_trace.o \
$(HDD_SRC_DIR)/wlan_hdd_tx_rx.o \ $(HDD_SRC_DIR)/wlan_hdd_tx_rx.o \
$(HDD_SRC_DIR)/wlan_hdd_wmm.o \ $(HDD_SRC_DIR)/wlan_hdd_wmm.o \
@ -206,6 +205,9 @@ ifeq ($(CONFIG_FEATURE_P2P_LISTEN_OFFLOAD), y)
HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_p2p_listen_offload.o HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_p2p_listen_offload.o
endif endif
ifeq ($(CONFIG_WLAN_SYSFS), y)
HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs.o
endif
########### Driver Synchronization Core (DSC) ########### ########### Driver Synchronization Core (DSC) ###########
DSC_DIR := components/dsc DSC_DIR := components/dsc
DSC_INC_DIR := $(DSC_DIR)/inc DSC_INC_DIR := $(DSC_DIR)/inc
@ -1910,14 +1912,11 @@ cppflags-$(CONFIG_WLAN_LOG_INFO) += -DWLAN_LOG_INFO
cppflags-$(CONFIG_WLAN_LOG_DEBUG) += -DWLAN_LOG_DEBUG cppflags-$(CONFIG_WLAN_LOG_DEBUG) += -DWLAN_LOG_DEBUG
cppflags-$(CONFIG_WLAN_LOG_ENTER) += -DWLAN_LOG_ENTER cppflags-$(CONFIG_WLAN_LOG_ENTER) += -DWLAN_LOG_ENTER
cppflags-$(CONFIG_WLAN_LOG_EXIT) += -DWLAN_LOG_EXIT cppflags-$(CONFIG_WLAN_LOG_EXIT) += -DWLAN_LOG_EXIT
cppflags-$(WLAN_OPEN_SOURCE) += -DWLAN_OPEN_SOURCE cppflags-$(WLAN_OPEN_SOURCE) += -DWLAN_OPEN_SOURCE
cppflags-$(CONFIG_FEATURE_STATS_EXT) += -DWLAN_FEATURE_STATS_EXT cppflags-$(CONFIG_FEATURE_STATS_EXT) += -DWLAN_FEATURE_STATS_EXT
cppflags-$(CONFIG_QCACLD_FEATURE_NAN) += -DWLAN_FEATURE_NAN cppflags-$(CONFIG_QCACLD_FEATURE_NAN) += -DWLAN_FEATURE_NAN
cppflags-$(CONFIG_QCA_IBSS_SUPPORT) += -DQCA_IBSS_SUPPORT cppflags-$(CONFIG_QCA_IBSS_SUPPORT) += -DQCA_IBSS_SUPPORT
cppflags-$(CONFIG_WLAN_SYSFS) += -DWLAN_SYSFS
#Enable OL debug and wmi unified functions #Enable OL debug and wmi unified functions
cppflags-$(CONFIG_ATH_PERF_PWR_OFFLOAD) += -DATH_PERF_PWR_OFFLOAD cppflags-$(CONFIG_ATH_PERF_PWR_OFFLOAD) += -DATH_PERF_PWR_OFFLOAD

2
configs/default_defconfig
View File

@ -89,6 +89,8 @@ endif
ifneq ($(CONFIG_MOBILE_ROUTER), y) ifneq ($(CONFIG_MOBILE_ROUTER), y)
#Flag to enable TDLS feature #Flag to enable TDLS feature
CONFIG_QCOM_TDLS := y CONFIG_QCOM_TDLS := y
CONFIG_WLAN_SYSFS := y
endif endif
CONFIG_QCACLD_FEATURE_GREEN_AP := y CONFIG_QCACLD_FEATURE_GREEN_AP := y

18
core/hdd/inc/wlan_hdd_sysfs.h
View File

@ -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 * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@ -16,6 +16,10 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifndef _WLAN_HDD_SYSFS_H_
#define _WLAN_HDD_SYSFS_H_
#ifdef WLAN_SYSFS
/** /**
* hdd_sysfs_create_version_interface() - create version interface * hdd_sysfs_create_version_interface() - create version interface
* @psoc: PSOC ptr * @psoc: PSOC ptr
@ -30,3 +34,15 @@ void hdd_sysfs_create_version_interface(struct wlan_objmgr_psoc *psoc);
* Return: none * Return: none
*/ */
void hdd_sysfs_destroy_version_interface(void); void hdd_sysfs_destroy_version_interface(void);
#else
static inline
void hdd_sysfs_create_version_interface(struct wlan_objmgr_psoc *psoc)
{
}
static inline
void hdd_sysfs_destroy_version_interface(void)
{
}
#endif
#endif