From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 1 Apr 2013 21:34:53 +0000 (+0200)
Subject: add ath5k tracing fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee21c030314154ceac7f3748e161a160d72c5cce;p=openwrt%2Fstaging%2Fblogic.git

add ath5k tracing fix

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---

diff --git a/patches/collateral-evolutions/network/73-ath5k-tracing/INFO b/patches/collateral-evolutions/network/73-ath5k-tracing/INFO
new file mode 100644
index 000000000000..038272bcc519
--- /dev/null
+++ b/patches/collateral-evolutions/network/73-ath5k-tracing/INFO
@@ -0,0 +1,11 @@
+ath5k tracing uses
+
+#define TRACE_INCLUDE_PATH ../../drivers/net/wireless/ath/ath5k
+
+This is problematic because it means that if you build the
+backported modules against a full kernel tree the build
+uses the original trace.h, not the one from backport, and
+this fails (due to the config symbol mangling, but it's more
+generally an issue)
+
+Fix this by doing the same all other drivers do.
diff --git a/patches/collateral-evolutions/network/73-ath5k-tracing/ath5k.patch b/patches/collateral-evolutions/network/73-ath5k-tracing/ath5k.patch
new file mode 100644
index 000000000000..1adb3f93a62b
--- /dev/null
+++ b/patches/collateral-evolutions/network/73-ath5k-tracing/ath5k.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/wireless/ath/ath5k/trace.h
++++ b/drivers/net/wireless/ath/ath5k/trace.h
+@@ -97,7 +97,7 @@ TRACE_EVENT(ath5k_tx_complete,
+ #if defined(CONFIG_ATH5K_TRACER) && !defined(__CHECKER__)
+ 
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH ../../drivers/net/wireless/ath/ath5k
++#define TRACE_INCLUDE_PATH .
+ #undef TRACE_INCLUDE_FILE
+ #define TRACE_INCLUDE_FILE trace
+ 
+--- a/drivers/net/wireless/ath/ath5k/Makefile
++++ b/drivers/net/wireless/ath/ath5k/Makefile
+@@ -10,6 +10,7 @@ ath5k-y				+= phy.o
+ ath5k-y				+= reset.o
+ ath5k-y				+= attach.o
+ ath5k-y				+= base.o
++CFLAGS_base.o			+= -I$(src)
+ ath5k-y				+= led.o
+ ath5k-y				+= rfkill.o
+ ath5k-y				+= ani.o