summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@frijolero.org>2012-03-09 14:55:01 -0800
committerLuis R. Rodriguez <mcgrof@frijolero.org>2012-03-09 14:55:45 -0800
commita9c2c6facd8385250e142e4acec92abf6ca43cb8 (patch)
treec2f1e94f57b26c14134745940d53a7ffb8a8f6b2
parent00af9d6482c539b9620af8e6efa6374221856d75 (diff)
compat-wireless: enable mac80211 tracing for kernels >= 2.6.33
Turns out this compiles now that we are in the future, so just disable tracing for older kernels. This goes unstested though. Requested-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
-rw-r--r--config.mk2
-rw-r--r--patches/44-deactivate-mac80211-tracing.patch8
2 files changed, 5 insertions, 5 deletions
diff --git a/config.mk b/config.mk
index 2650a701..965dc56a 100644
--- a/config.mk
+++ b/config.mk
@@ -151,7 +151,7 @@ endif #CONFIG_COMPAT_RHEL_6_0
CONFIG_MAC80211=m
ifndef CONFIG_COMPAT_KERNEL_2_6_33
-CONFIG_MAC80211_DRIVER_API_TRACER=y
+CONFIG_COMPAT_MAC80211_DRIVER_API_TRACER=y
endif #CONFIG_COMPAT_KERNEL_2_6_33
# CONFIG_MAC80211_DEBUGFS=y
diff --git a/patches/44-deactivate-mac80211-tracing.patch b/patches/44-deactivate-mac80211-tracing.patch
index 6445f30c..bb559ab6 100644
--- a/patches/44-deactivate-mac80211-tracing.patch
+++ b/patches/44-deactivate-mac80211-tracing.patch
@@ -1,15 +1,15 @@
-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.
+Do not activate the mac80211 tracing for kernels <= 2.6.32
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
-@@ -25,7 +25,7 @@ mac80211-y := \
+@@ -25,7 +25,9 @@ mac80211-y := \
wme.o \
event.o \
chan.o \
- driver-trace.o mlme.o
+ mlme.o
++
++mac80211-$(CONFIG_COMPAT_MAC80211_DRIVER_API_TRACER) += driver-trace.o
mac80211-$(CONFIG_MAC80211_LEDS) += led.o
mac80211-$(CONFIG_MAC80211_DEBUGFS) += \