瀏覽代碼

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
hqu 4 年之前
父節點
當前提交
55fbe3e774
共有 3 個文件被更改,包括 4 次插入10 次删除
  1. 3 6
      Kbuild
  2. 0 3
      configs/default_defconfig
  3. 1 1
      core/sme/src/csr/csr_api_roam.c

+ 3 - 6
Kbuild

@@ -1279,11 +1279,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)
 
@@ -2647,7 +2644,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-y += -DWLAN_FEATURE_INTERFACE_MGR
 cppflags-$(CONFIG_HOST_WAKEUP_OVER_QMI) += -DHOST_WAKEUP_OVER_QMI
 

+ 0 - 3
configs/default_defconfig

@@ -1169,9 +1169,6 @@ CONFIG_RX_HASH_DEBUG := y
 #Enable connection manager
 CONFIG_CM_ENABLE := n
 
-#Flag to enable roam offload compilation of connection manager module
-CONFIG_CM_ROAM_OFFLOAD := y
-
 #Enable VDEV OPS wakelock feature
 CONFIG_FEATURE_VDEV_OPS_WAKELOCK := y
 

+ 1 - 1
core/sme/src/csr/csr_api_roam.c

@@ -20442,7 +20442,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,