From 08fac0d4c2453e5f47bdf1cf513047d5545f76ff Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Thu, 15 Nov 2012 08:07:59 -0600 Subject: [PATCH] --- yaml --- r: 341520 b: refs/heads/master c: f5c4f10852d42012c6a7a793c15bf18882e61da0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/Kconfig | 11 +++++++++++ .../wireless/brcm80211/brcmsmac/brcms_trace_events.h | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4350a828bc35..197373bca7e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75be3e24eeedbc9ec5faf3483fe9b449abec94e8 +refs/heads/master: f5c4f10852d42012c6a7a793c15bf18882e61da0 diff --git a/trunk/drivers/net/wireless/brcm80211/Kconfig b/trunk/drivers/net/wireless/brcm80211/Kconfig index b480088b3dbe..1d92d874ebb6 100644 --- a/trunk/drivers/net/wireless/brcm80211/Kconfig +++ b/trunk/drivers/net/wireless/brcm80211/Kconfig @@ -55,6 +55,17 @@ config BRCMFMAC_USB IEEE802.11n embedded FullMAC WLAN driver. Say Y if you want to use the driver for an USB wireless card. +config BRCM_TRACING + bool "Broadcom device tracing" + depends on BRCMSMAC || BRCMFMAC + ---help--- + If you say Y here, the Broadcom wireless drivers will register + with ftrace to dump event information into the trace ringbuffer. + Tracing can be enabled at runtime to aid in debugging wireless + issues. This option adds a small amount of overhead when tracing + is disabled. If unsure, say Y to allow developers to better help + you when wireless problems occur. + config BRCMDBG bool "Broadcom driver debug functions" depends on BRCMSMAC || BRCMFMAC diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h b/trunk/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h index 27dd73eef56d..bcf6969044a2 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h +++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h @@ -24,7 +24,7 @@ #include #include "mac80211_if.h" -#ifndef CONFIG_BRCMDBG +#ifndef CONFIG_BRCM_TRACING #undef TRACE_EVENT #define TRACE_EVENT(name, proto, ...) \ static inline void trace_ ## name(proto) {} @@ -80,7 +80,7 @@ TRACE_EVENT(brcms_dpc, #endif /* __TRACE_BRCMSMAC_H */ -#ifdef CONFIG_BRCMDBG +#ifdef CONFIG_BRCM_TRACING #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . @@ -89,4 +89,4 @@ TRACE_EVENT(brcms_dpc, #include -#endif /* CONFIG_BRCMDBG */ +#endif /* CONFIG_BRCM_TRACING */