diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-06-22 12:55:52 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-24 11:32:38 +0200 |
| commit | 011ad0e9f8533cd003fb760663713df2655a2114 (patch) | |
| tree | 75f08348ca9cd75c25782b1d4de88170eec0085c /net | |
| parent | bdcbd8e0e3ffdad32b14b6373e67bfcf5fd3f002 (diff) | |
| download | blackbird-op-linux-011ad0e9f8533cd003fb760663713df2655a2114.tar.gz blackbird-op-linux-011ad0e9f8533cd003fb760663713df2655a2114.zip | |
mac80211: rename driver-trace file
This file will contain more soon, so
rename it to just trace.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/Makefile | 4 | ||||
| -rw-r--r-- | net/mac80211/driver-ops.h | 2 | ||||
| -rw-r--r-- | net/mac80211/offchannel.c | 1 | ||||
| -rw-r--r-- | net/mac80211/trace.c (renamed from net/mac80211/driver-trace.c) | 2 | ||||
| -rw-r--r-- | net/mac80211/trace.h (renamed from net/mac80211/driver-trace.h) | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index 231ffa02e496..a7dd110faafa 100644 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile @@ -24,7 +24,7 @@ mac80211-y := \ wme.o \ event.o \ chan.o \ - driver-trace.o mlme.o + trace.o mlme.o mac80211-$(CONFIG_MAC80211_LEDS) += led.o mac80211-$(CONFIG_MAC80211_DEBUGFS) += \ @@ -42,7 +42,7 @@ mac80211-$(CONFIG_MAC80211_MESH) += \ mac80211-$(CONFIG_PM) += pm.o -CFLAGS_driver-trace.o := -I$(src) +CFLAGS_trace.o := -I$(src) # objects for PID algorithm rc80211_pid-y := rc80211_pid_algo.o diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 933026949df9..44e8c1242781 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -3,7 +3,7 @@ #include <net/mac80211.h> #include "ieee80211_i.h" -#include "driver-trace.h" +#include "trace.h" static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata) { diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 7f93626ddc61..b0fb6a2b89ad 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -15,7 +15,6 @@ #include <linux/export.h> #include <net/mac80211.h> #include "ieee80211_i.h" -#include "driver-trace.h" #include "driver-ops.h" /* diff --git a/net/mac80211/driver-trace.c b/net/mac80211/trace.c index 8ed8711b1a6d..943da6e7076c 100644 --- a/net/mac80211/driver-trace.c +++ b/net/mac80211/trace.c @@ -5,5 +5,5 @@ #ifndef __CHECKER__ #include "driver-ops.h" #define CREATE_TRACE_POINTS -#include "driver-trace.h" +#include "trace.h" #endif diff --git a/net/mac80211/driver-trace.h b/net/mac80211/trace.h index a0f7d357884d..392bcc9f6a12 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/trace.h @@ -1637,5 +1637,5 @@ TRACE_EVENT(stop_queue, #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE driver-trace +#define TRACE_INCLUDE_FILE trace #include <trace/define_trace.h> |
