diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-02-07 11:28:11 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-02-07 11:28:11 +0000 |
| commit | ea63948914b33029f287188c4fb984ee9f97e8e0 (patch) | |
| tree | 230240e51165116d8a2b2065982f58df67c73219 /package/mac80211/patches/070-deactivate_mac80211_tracing.patch | |
| parent | e430c864f45e1f437c96a1e8a416e8b32edf5598 (diff) | |
| download | mtk-20170518-ea63948914b33029f287188c4fb984ee9f97e8e0.zip mtk-20170518-ea63948914b33029f287188c4fb984ee9f97e8e0.tar.gz mtk-20170518-ea63948914b33029f287188c4fb984ee9f97e8e0.tar.bz2 | |
mac80211: update to wireless-testing 2012-02-06
SVN-Revision: 30346
Diffstat (limited to 'package/mac80211/patches/070-deactivate_mac80211_tracing.patch')
| -rw-r--r-- | package/mac80211/patches/070-deactivate_mac80211_tracing.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/package/mac80211/patches/070-deactivate_mac80211_tracing.patch b/package/mac80211/patches/070-deactivate_mac80211_tracing.patch deleted file mode 100644 index feff5eb..0000000 --- a/package/mac80211/patches/070-deactivate_mac80211_tracing.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 -@@ -24,8 +24,7 @@ mac80211-y := \ - util.o \ - wme.o \ - event.o \ -- chan.o \ -- driver-trace.o -+ chan.o - - mac80211-$(CONFIG_MAC80211_LEDS) += led.o - mac80211-$(CONFIG_MAC80211_DEBUGFS) += \ -@@ -42,6 +41,7 @@ mac80211-$(CONFIG_MAC80211_MESH) += \ - - mac80211-$(CONFIG_PM) += pm.o - -+mac80211-$(CONFIG_MAC80211_DRIVER_API_TRACER) += driver-trace.o - CFLAGS_driver-trace.o := -I$(src) - - # objects for PID algorithm ---- a/net/mac80211/driver-trace.h -+++ b/net/mac80211/driver-trace.h -@@ -5,6 +5,17 @@ - #include <net/mac80211.h> - #include "ieee80211_i.h" - -+#if !defined(CONFIG_MAC80211_DRIVER_API_TRACER) || defined(__CHECKER__) -+#undef TRACE_EVENT -+#define TRACE_EVENT(name, proto, ...) \ -+static inline void trace_ ## name(proto) {} -+#undef DECLARE_EVENT_CLASS -+#define DECLARE_EVENT_CLASS(...) -+#undef DEFINE_EVENT -+#define DEFINE_EVENT(evt_class, name, proto, ...) \ -+static inline void trace_ ## name(proto) {} -+#endif -+ - #undef TRACE_SYSTEM - #define TRACE_SYSTEM mac80211 - |