Browse Source

qcacld-3.0: Properly featurize NAN

When CONFIG_MOBILE_ROUTER is enabled there are build failures
due to improper featurization of NAN, so fix the featurization.

Change-Id: Ib5cd54b2d443ced73c9b99218ce28d3eb0ba8786
CRs-Fixed: 2355789
jiad 6 years ago
parent
commit
ff1ac139a2
2 changed files with 13 additions and 0 deletions
  1. 6 0
      core/hdd/src/wlan_hdd_main.c
  2. 7 0
      core/mac/src/pe/lim/lim_api.c

+ 6 - 0
core/hdd/src/wlan_hdd_main.c

@@ -2724,6 +2724,7 @@ static void hdd_register_policy_manager_callback(
 }
 #endif
 
+#ifdef WLAN_FEATURE_NAN_DATAPATH
 static void hdd_nan_register_callbacks(struct hdd_context *hdd_ctx)
 {
 	struct nan_callbacks cb_obj = {0};
@@ -2741,6 +2742,11 @@ static void hdd_nan_register_callbacks(struct hdd_context *hdd_ctx)
 
 	os_if_nan_register_hdd_callbacks(hdd_ctx->psoc, &cb_obj);
 }
+#else
+static inline void hdd_nan_register_callbacks(struct hdd_context *hdd_ctx)
+{
+}
+#endif
 
 #ifdef CONFIG_LEAK_DETECTION
 /**

+ 7 - 0
core/mac/src/pe/lim/lim_api.c

@@ -608,6 +608,8 @@ static void lim_register_debug_callback(void)
 {
 }
 #endif /* WLAN_FEATURE_MEMDUMP_ENABLE */
+
+#ifdef WLAN_FEATURE_NAN_CONVERGENCE
 static void lim_nan_register_callbacks(tpAniSirGlobal mac_ctx)
 {
 	struct nan_callbacks cb_obj = {0};
@@ -618,6 +620,11 @@ static void lim_nan_register_callbacks(tpAniSirGlobal mac_ctx)
 
 	ucfg_nan_register_lim_callbacks(mac_ctx->psoc, &cb_obj);
 }
+#else
+static inline void lim_nan_register_callbacks(tpAniSirGlobal mac_ctx)
+{
+}
+#endif
 
 /*
  * pe_shutdown_notifier_cb - Shutdown notifier callback