* [PATCH] compat-iwlwifi: properly handle mac80211 tracing
@ 2012-03-04 9:09 Johannes Berg
2012-03-04 9:18 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2012-03-04 9:09 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
From: Johannes Berg <johannes.berg@intel.com>
When tracing was disabled by default, we got build
errors when it was enabled after all because then
the driver-trace.c file was never built, fix that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
patches/44-deactivate-mac80211-tracing.patch | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/patches/44-deactivate-mac80211-tracing.patch b/patches/44-deactivate-mac80211-tracing.patch
index 6445f30..9f79b89 100644
--- a/patches/44-deactivate-mac80211-tracing.patch
+++ b/patches/44-deactivate-mac80211-tracing.patch
@@ -2,14 +2,16 @@ Do not activate the mac80211 tracing by default as it does not work with
kernel <= 2.6.32. Compat also includes include/trace/define_trace.h over
include/trace/events/module.h which makes this not compiling any more.
---- a/net/mac80211/Makefile
-+++ b/net/mac80211/Makefile
-@@ -25,7 +25,7 @@ mac80211-y := \
+--- a/net/mac80211/Makefile 2012-02-24 16:39:05.000000000 +0100
++++ b/net/mac80211/Makefile 2012-03-04 10:04:01.000000000 +0100
+@@ -25,8 +25,9 @@ mac80211-y := \
wme.o \
event.o \
chan.o \
- driver-trace.o mlme.o
+ mlme.o
++mac80211-$(CONFIG_MAC80211_DRIVER_API_TRACER) += driver-trace.o
mac80211-$(CONFIG_MAC80211_LEDS) += led.o
mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
+ debugfs.o \
--
1.7.6.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] compat-iwlwifi: properly handle mac80211 tracing
2012-03-04 9:09 [PATCH] compat-iwlwifi: properly handle mac80211 tracing Johannes Berg
@ 2012-03-04 9:18 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2012-03-04 9:18 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless
Err. The subject should say compat-wireless of course, doh!
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-04 9:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-04 9:09 [PATCH] compat-iwlwifi: properly handle mac80211 tracing Johannes Berg
2012-03-04 9:18 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox