samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Limiting a function declaration within CONFIG_MCL

Browse Source 
Function dbglog_set_log_lvl needs to be commented out for WIN compilation
since enum DBG_LOG_LVL is not converged. Functions nl_srv_bcast and
nl_srv_is_initialized needs to be exported out for pushing FW Diag Log
events to user-space (cnss-diag)

CRs-Fixed: 2048651
Change-Id: I57a4bd3d78680b97bd75191ca58349abeb77240a
This commit is contained in:
Adil Saeed Musthafa
2017-05-17 18:45:42 -07:00
committed by snandini
parent 4140c76598
commit 5a0a7073fd
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/fwlog/dbglog_host.h
View File

@@ -116,6 +116,12 @@ dbglog_set_timestamp_resolution(wmi_unified_t wmi_handle,
int int
dbglog_report_enable(wmi_unified_t wmi_handle, A_BOOL isenable); dbglog_report_enable(wmi_unified_t wmi_handle, A_BOOL isenable);
#ifdef CONFIG_MCL
/*
* enum DBGLOG_LOG_LVL is not converged between WIN and MCL.
* So this function declaration needs to be disabled from WIN side.
*/
/** Set the log level /** Set the log level
* @brief DBGLOG_INFO - Information lowest log level * @brief DBGLOG_INFO - Information lowest log level
* @brief DBGLOG_WARNING * @brief DBGLOG_WARNING
@@ -123,6 +129,7 @@ dbglog_report_enable(wmi_unified_t wmi_handle, A_BOOL isenable);
*/ */
int int
dbglog_set_log_lvl(wmi_unified_t wmi_handle, enum DBGLOG_LOG_LVL log_lvl); dbglog_set_log_lvl(wmi_unified_t wmi_handle, enum DBGLOG_LOG_LVL log_lvl);
#endif
/* /*
* set the debug log level for a given module * set the debug log level for a given module

9
utils/nlink/src/wlan_nlink_srv.c
View File

@@ -50,6 +50,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <wlan_nlink_srv.h> #include <wlan_nlink_srv.h>
#include <qdf_trace.h> #include <qdf_trace.h>
#include <qdf_module.h>
#ifdef CNSS_GENL #ifdef CNSS_GENL
#include <qdf_mem.h> #include <qdf_mem.h>
@@ -196,6 +197,7 @@ int nl_srv_bcast(struct sk_buff *skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return err; return err;
} }
qdf_export_symbol(nl_srv_bcast);
/** /**
* nl_srv_unregister() - wrapper function to unregister event to cnss_logger * nl_srv_unregister() - wrapper function to unregister event to cnss_logger
@@ -271,6 +273,7 @@ inline int nl_srv_is_initialized(void)
else else
return -EPERM; return -EPERM;
} }
qdf_export_symbol(nl_srv_is_initialized);
#else #else
@@ -510,6 +513,7 @@ int nl_srv_bcast(struct sk_buff *skb, int mcgroup_id, int app_id)
qdf_mem_free(tempbuf); qdf_mem_free(tempbuf);
return 0; return 0;
} }
qdf_export_symbol(nl_srv_bcast);
/** /**
* nl_srv_ucast() - wrapper function to do unicast events to user space apps * nl_srv_ucast() - wrapper function to do unicast events to user space apps
@@ -605,6 +609,7 @@ int nl_srv_bcast(struct sk_buff *skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return err; return err;
} }
qdf_export_symbol(nl_srv_bcast);
#endif #endif
/* /*
@@ -713,6 +718,7 @@ int nl_srv_is_initialized(void)
return -EPERM; return -EPERM;
} }
qdf_export_symbol(nl_srv_is_initialized);
#endif #endif
#else /* ifndef MULTI_IF_NAME */ #else /* ifndef MULTI_IF_NAME */
@@ -746,14 +752,15 @@ int nl_srv_bcast(struct sk_buff *skb)
{ {
return 0; return 0;
} }
qdf_export_symbol(nl_srv_bcast);
int nl_srv_is_initialized(void) int nl_srv_is_initialized(void)
{ {
return 0; return 0;
} }
qdf_export_symbol(nl_srv_is_initialized);
#endif #endif
/** /**
* nl_srv_ucast_oem() - Wrapper function to send ucast msgs to OEM * nl_srv_ucast_oem() - Wrapper function to send ucast msgs to OEM
* @skb: sk buffer pointer * @skb: sk buffer pointer