From 3cb98124c1fffa1e08382fcf26e642b14b3e2b24 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Wed, 11 Apr 2018 16:09:48 -0700 Subject: [PATCH] qcacmn: Fix NBUF_MEMORY_DEBUG PERF build error qdf_net_buf_debug_init/exit() are defined when NBUF_MEMORY_DEBUG is disabled, but they are not declared in the nbuf header file, leading to build errors for PERF builds. Make qdf_net_buf_debug_init/exit() static inline stubs when NBUF_MEMORY_DEBUG is disabled. Change-Id: I4180086f27873a48cb965abed21f4bca2a4ca3a1 CRs-Fixed: 2222969 --- qdf/inc/qdf_nbuf.h | 7 +++++-- qdf/linux/src/qdf_nbuf.c | 14 +------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/qdf/inc/qdf_nbuf.h b/qdf/inc/qdf_nbuf.h index b6aa24dff71a..401c681a89f6 100644 --- a/qdf/inc/qdf_nbuf.h +++ b/qdf/inc/qdf_nbuf.h @@ -1166,7 +1166,10 @@ qdf_nbuf_copy_debug(qdf_nbuf_t buf, uint8_t *file_name, return copied_buf; } -#else +#else /* NBUF_MEMORY_DEBUG */ + +static inline void qdf_net_buf_debug_init(void) {} +static inline void qdf_net_buf_debug_exit(void) {} static inline void qdf_net_buf_debug_acquire_skb(qdf_nbuf_t net_buf, uint8_t *file_name, uint32_t line_num) @@ -1219,7 +1222,7 @@ static inline qdf_nbuf_t qdf_nbuf_copy(qdf_nbuf_t buf) return __qdf_nbuf_copy(buf); } -#endif +#endif /* NBUF_MEMORY_DEBUG */ #ifdef WLAN_FEATURE_FASTPATH /** diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index cfef351dab17..7a0d4d4557b1 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -2641,20 +2641,8 @@ free_buf: } qdf_export_symbol(qdf_nbuf_free_debug); -#else -void qdf_net_buf_debug_init(void) -{ -} +#endif /* NBUF_MEMORY_DEBUG */ -qdf_export_symbol(qdf_net_buf_debug_init); - -void qdf_net_buf_debug_exit(void) -{ -} - -qdf_export_symbol(qdf_net_buf_debug_exit); - -#endif /*NBUF_MEMORY_DEBUG */ #if defined(FEATURE_TSO) /**