kernel: backport ssb changes from 4.4-rc1
[openwrt/staging/yousong.git] / package / kernel / mac80211 / patches / 400-ath_move_debug_code.patch
1 --- a/drivers/net/wireless/ath/Makefile
2 +++ b/drivers/net/wireless/ath/Makefile
3 @@ -13,10 +13,10 @@ ath-objs := main.o \
4 regd.o \
5 hw.o \
6 key.o \
7 + debug.o \
8 dfs_pattern_detector.o \
9 dfs_pri_detector.o
10
11 -ath-$(CPTCFG_ATH_DEBUG) += debug.o
12 ath-$(CPTCFG_ATH_TRACEPOINTS) += trace.o
13
14 ccflags-y += -D__CHECK_ENDIAN__
15 --- a/drivers/net/wireless/ath/ath.h
16 +++ b/drivers/net/wireless/ath/ath.h
17 @@ -318,13 +318,6 @@ void _ath_dbg(struct ath_common *common,
18 #endif /* CPTCFG_ATH_DEBUG */
19
20 /** Returns string describing opmode, or NULL if unknown mode. */
21 -#ifdef CPTCFG_ATH_DEBUG
22 const char *ath_opmode_to_string(enum nl80211_iftype opmode);
23 -#else
24 -static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
25 -{
26 - return "UNKNOWN";
27 -}
28 -#endif
29
30 #endif /* ATH_H */