Jelajahi Sumber

qcacld-3.0: Kbuild: Cleanup DFS_OBJS logic

Currently DFS_OBJS are added to OBJS when
CONFIG_WLAN_DFS_MASTER_ENABLE is enabled.  An upcoming change requires
that assignments to OBJS be unconditional, so relocate the condition
to wrap the assignment of DFS_OBJS.

Change-Id: I0c04087feb76c7fbbaa4231f1c36a83624e54482
CRs-Fixed: 2868004
Jeff Johnson 4 tahun lalu
induk
melakukan
b437ed67e4
1 mengubah file dengan 3 tambahan dan 3 penghapusan
  1. 3 3
      Kbuild

+ 3 - 3
Kbuild

@@ -625,6 +625,8 @@ DFS_INC :=	-I$(WLAN_ROOT)/$(DFS_DISP_INC_DIR) \
 		-I$(WLAN_ROOT)/$(DFS_TARGET_INC_DIR) \
 		-I$(WLAN_ROOT)/$(DFS_CMN_SERVICES_INC_DIR)
 
+ifeq ($(CONFIG_WLAN_DFS_MASTER_ENABLE), y)
+
 DFS_OBJS :=	$(DFS_CORE_SRC_DIR)/misc/dfs.o \
 		$(DFS_CORE_SRC_DIR)/misc/dfs_nol.o \
 		$(DFS_CORE_SRC_DIR)/misc/dfs_random_chan_sel.o \
@@ -655,6 +657,7 @@ DFS_OBJS +=	$(WLAN_COMMON_ROOT)/target_if/dfs/src/target_if_dfs_partial_offload.
 		$(DFS_CORE_SRC_DIR)/filtering/dfs_partial_offload_radar.o \
 		$(DFS_CORE_SRC_DIR)/misc/dfs_filter_init.o
 endif
+endif
 
 ############ SME ############
 SME_DIR :=	core/sme
@@ -2535,10 +2538,7 @@ ifeq ($(CONFIG_FEATURE_EPPING), y)
 OBJS += 	$(EPPING_OBJS)
 endif
 
-ifeq ($(CONFIG_WLAN_DFS_MASTER_ENABLE), y)
 OBJS +=		$(DFS_OBJS)
-endif
-
 OBJS +=		$(UMAC_OBJMGR_OBJS)
 OBJS +=		$(WIFI_POS_OBJS)
 OBJS +=		$(CP_STATS_OBJS)