Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -6
+2 -2
net/mac80211/Makefile
··· 24 24 wme.o \ 25 25 event.o \ 26 26 chan.o \ 27 - driver-trace.o mlme.o 27 + trace.o mlme.o 28 28 29 29 mac80211-$(CONFIG_MAC80211_LEDS) += led.o 30 30 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \ ··· 42 42 43 43 mac80211-$(CONFIG_PM) += pm.o 44 44 45 - CFLAGS_driver-trace.o := -I$(src) 45 + CFLAGS_trace.o := -I$(src) 46 46 47 47 # objects for PID algorithm 48 48 rc80211_pid-y := rc80211_pid_algo.o
+1 -1
net/mac80211/driver-ops.h
··· 3 3 4 4 #include <net/mac80211.h> 5 5 #include "ieee80211_i.h" 6 - #include "driver-trace.h" 6 + #include "trace.h" 7 7 8 8 static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata) 9 9 {
+1 -1
net/mac80211/driver-trace.c net/mac80211/trace.c
··· 5 5 #ifndef __CHECKER__ 6 6 #include "driver-ops.h" 7 7 #define CREATE_TRACE_POINTS 8 - #include "driver-trace.h" 8 + #include "trace.h" 9 9 #endif
+1 -1
net/mac80211/driver-trace.h net/mac80211/trace.h
··· 1637 1637 #undef TRACE_INCLUDE_PATH 1638 1638 #define TRACE_INCLUDE_PATH . 1639 1639 #undef TRACE_INCLUDE_FILE 1640 - #define TRACE_INCLUDE_FILE driver-trace 1640 + #define TRACE_INCLUDE_FILE trace 1641 1641 #include <trace/define_trace.h>
-1
net/mac80211/offchannel.c
··· 15 15 #include <linux/export.h> 16 16 #include <net/mac80211.h> 17 17 #include "ieee80211_i.h" 18 - #include "driver-trace.h" 19 18 #include "driver-ops.h" 20 19 21 20 /*