From: Johannes Berg <johannes@sipsolutions.net>
To: "Luis R. Rodriguez" <mcgrof@gmail.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH] compat-iwlwifi: properly handle mac80211 tracing
Date: Sun, 04 Mar 2012 10:09:36 +0100 [thread overview]
Message-ID: <1330852176.4000.7.camel@jlt3.sipsolutions.net> (raw)
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
next reply other threads:[~2012-03-04 9:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-04 9:09 Johannes Berg [this message]
2012-03-04 9:18 ` [PATCH] compat-iwlwifi: properly handle mac80211 tracing Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330852176.4000.7.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox