Search Linux Wireless

[PATCH] compat-wireless: don't hack mac80211 tracing

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Johannes Berg <johannes.berg@xxxxxxxxx>

This is no longer needed since Luis's tracing backport.

Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
I'm not actually sure about this, but it seems like your tracing
backport would have addressed it?


 config.mk                                    |    4 ----
 patches/44-deactivate-mac80211-tracing.patch |   15 ---------------
 2 files changed, 0 insertions(+), 19 deletions(-)
 delete mode 100644 patches/44-deactivate-mac80211-tracing.patch

diff --git a/config.mk b/config.mk
index 965dc56..7bab4cf 100644
--- a/config.mk
+++ b/config.mk
@@ -150,10 +150,6 @@ endif #CONFIG_COMPAT_RHEL_6_0
 # Wireless subsystem stuff
 CONFIG_MAC80211=m
 
-ifndef CONFIG_COMPAT_KERNEL_2_6_33
-CONFIG_COMPAT_MAC80211_DRIVER_API_TRACER=y
-endif #CONFIG_COMPAT_KERNEL_2_6_33
-
 # CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_NOINLINE=y
 # CONFIG_MAC80211_VERBOSE_DEBUG=y
diff --git a/patches/44-deactivate-mac80211-tracing.patch b/patches/44-deactivate-mac80211-tracing.patch
deleted file mode 100644
index bb559ab..0000000
--- a/patches/44-deactivate-mac80211-tracing.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Do not activate the mac80211 tracing for kernels <= 2.6.32
-
---- a/net/mac80211/Makefile
-+++ b/net/mac80211/Makefile
-@@ -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) += \
-- 
1.7.9.1



--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux