From: Pavel Roskin <proski@gnu.org>
To: "Luis R. Rodriguez" <mcgrof@gmail.com>, linux-wireless@vger.kernel.org
Subject: [PATCH 2/4] compat-wireless: remove 13-trace.patch, it's handled in compat now
Date: Wed, 07 Apr 2010 01:30:56 -0400 [thread overview]
Message-ID: <20100407053056.23575.12200.stgit@mj.roinet.com> (raw)
In-Reply-To: <20100407053051.23575.94594.stgit@mj.roinet.com>
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
patches/13-trace.patch | 63 ------------------------------------------------
1 files changed, 0 insertions(+), 63 deletions(-)
delete mode 100644 patches/13-trace.patch
diff --git a/patches/13-trace.patch b/patches/13-trace.patch
deleted file mode 100644
index e3fee40..0000000
--- a/patches/13-trace.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Older kernels do not have trace/define_trace.h [1] and if there
-is something there that we can backport we will define it
-in or compat headers.
-
-[1] http://lxr.linux.no/#linux+v2.6.31/include/trace/define_trace.h
-
---- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
-+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
-@@ -27,7 +27,9 @@
- #if !defined(__IWLWIFI_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ)
- #define __IWLWIFI_DEVICE_TRACE
-
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
- #include <linux/tracepoint.h>
-+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */
-
- #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__)
- #undef TRACE_EVENT
-@@ -263,4 +265,6 @@ TRACE_EVENT(iwlwifi_dev_ucode_event,
- #define TRACE_INCLUDE_PATH .
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE iwl-devtrace
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
- #include <trace/define_trace.h>
-+#endif
---- a/drivers/net/wireless/iwmc3200wifi/trace.h
-+++ b/drivers/net/wireless/iwmc3200wifi/trace.h
-@@ -1,7 +1,9 @@
- #if !defined(__IWM_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)
- #define __IWM_TRACE_H__
-
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
- #include <linux/tracepoint.h>
-+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */
-
- #if !defined(CONFIG_IWM_TRACING)
- #undef TRACE_EVENT
-@@ -280,4 +282,6 @@ TRACE_EVENT(iwm_rx_packet,
- #define TRACE_INCLUDE_PATH .
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE trace
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
- #include <trace/define_trace.h>
-+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */
---- a/net/mac80211/driver-trace.h
-+++ b/net/mac80211/driver-trace.h
-@@ -1,7 +1,9 @@
- #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ)
- #define __MAC80211_DRIVER_TRACE
-
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
- #include <linux/tracepoint.h>
-+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */
- #include <net/mac80211.h>
- #include "ieee80211_i.h"
-
-@@ -772,4 +774,6 @@ TRACE_EVENT(drv_flush,
- #define TRACE_INCLUDE_PATH .
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE driver-trace
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
- #include <trace/define_trace.h>
-+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */
next prev parent reply other threads:[~2010-04-07 5:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-07 5:30 [PATCH 1/4] compat-wireless: remove patch part dealing with net/net_namespace.h Pavel Roskin
2010-04-07 5:30 ` Pavel Roskin [this message]
2010-04-07 5:31 ` [PATCH 3/4] compat-wireless: remove 25-device_create.patch, it's handled by compat Pavel Roskin
2010-04-07 5:31 ` [PATCH 4/4] compat-wireless: find the actual remote URL Pavel Roskin
2010-04-07 7:12 ` Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100407053056.23575.12200.stgit@mj.roinet.com \
--to=proski@gnu.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mcgrof@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.