From f386197c9f2d03210e43a887747a06b86bc49598 Mon Sep 17 00:00:00 2001 From: Huashan Qu Date: Wed, 3 Mar 2021 21:23:28 +0800 Subject: [PATCH] qcacld-3.0: Enable RSO ROAM_OFFLOAD_V1 path for all configs Enable roam scan offload ROAM_OFFLOAD_V1 path for all configs. Change-Id: Id3386c2f391f98fb67734fdd17919782d0240f18 CRs-Fixed: 2798357 --- Kbuild | 9 +++------ configs/default_defconfig | 3 --- core/sme/src/csr/csr_api_roam.c | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Kbuild b/Kbuild index 56624d313934..909d0ce2766c 100644 --- a/Kbuild +++ b/Kbuild @@ -1342,11 +1342,8 @@ MLME_INC += $(CM_INC) CM_ROAM_OBJS := $(CM_DIR)/dispatcher/src/wlan_cm_tgt_if_tx_api.o \ $(CM_DIR)/dispatcher/src/wlan_cm_roam_api.o \ $(CM_DIR)/dispatcher/src/wlan_cm_roam_ucfg_api.o \ - $(CM_TGT_IF_DIR)/src/target_if_cm_roam_offload.o - -ifeq ($(CONFIG_CM_ROAM_OFFLOAD), y) -CM_ROAM_OBJS += $(CM_DIR)/core/src/wlan_cm_roam_offload.o -endif + $(CM_TGT_IF_DIR)/src/target_if_cm_roam_offload.o \ + $(CM_DIR)/core/src/wlan_cm_roam_offload.o MLME_OBJS += $(CM_ROAM_OBJS) @@ -2667,7 +2664,7 @@ cppflags-$(CONFIG_FEATURE_MOTION_DETECTION) += -DWLAN_FEATURE_MOTION_DETECTION cppflags-$(CONFIG_WLAN_FW_OFFLOAD) += -DWLAN_FW_OFFLOAD cppflags-$(CONFIG_WLAN_FEATURE_ELNA) += -DWLAN_FEATURE_ELNA cppflags-$(CONFIG_FEATURE_COEX) += -DFEATURE_COEX -cppflags-$(CONFIG_CM_ROAM_OFFLOAD) += -DROAM_OFFLOAD_V1 +cppflags-y += -DROAM_OFFLOAD_V1 cppflags-$(CONFIG_INTERFACE_MGR) += -DWLAN_FEATURE_INTERFACE_MGR cppflags-$(CONFIG_HOST_WAKEUP_OVER_QMI) += -DHOST_WAKEUP_OVER_QMI diff --git a/configs/default_defconfig b/configs/default_defconfig index c23e4d93581f..7ae9ff65004c 100644 --- a/configs/default_defconfig +++ b/configs/default_defconfig @@ -1185,9 +1185,6 @@ CONFIG_DEBUG_RX_RING_BUFFER := y #Enable Hash debug CONFIG_RX_HASH_DEBUG := y -#Flag to enable roam offload compilation of connection manager module -CONFIG_CM_ROAM_OFFLOAD := y - #Flag to enable interface manager CONFIG_INTERFACE_MGR := y diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 76dcf9842a31..e1f6fe8ef87d 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -20331,7 +20331,7 @@ csr_cm_update_rso_ese_info(struct mac_context *mac, rso_config->rso_11r_info.is_11r_assoc = roam_info->is11rAssoc; } #else -static +static inline void csr_cm_update_rso_ese_info(struct mac_context *mac, struct wlan_roam_scan_offload_params *rso_config, tpCsrNeighborRoamControlInfo roam_info,