diff options
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | patches/44-deactivate-mac80211-tracing.patch | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -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) += \ |