A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Properly featurize NAN

Browse source 
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
This commit is contained in:
jiad 2018-11-26 16:27:48 +08:00 • committed by nshrivas
commit ff1ac139a2
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/hdd/src/wlan_hdd_main.c
View file

@ -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
core/mac/src/pe/lim/lim_api.c
View file

@ -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