400-ath_move_debug_code.patch 891 B

12345678910111213141516171819202122232425262728293031
  1. --- a/drivers/net/wireless/ath/Makefile
  2. +++ b/drivers/net/wireless/ath/Makefile
  3. @@ -15,10 +15,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. -ath-$(CPTCFG_ATH_DEBUG) += debug.o
  11. ath-$(CPTCFG_ATH_TRACEPOINTS) += trace.o
  12. CFLAGS_trace.o := -I$(src)
  13. --- a/drivers/net/wireless/ath/ath.h
  14. +++ b/drivers/net/wireless/ath/ath.h
  15. @@ -317,14 +317,7 @@ void _ath_dbg(struct ath_common *common,
  16. #endif /* CPTCFG_ATH_DEBUG */
  17. /** Returns string describing opmode, or NULL if unknown mode. */
  18. -#ifdef CPTCFG_ATH_DEBUG
  19. const char *ath_opmode_to_string(enum nl80211_iftype opmode);
  20. -#else
  21. -static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)
  22. -{
  23. - return "UNKNOWN";
  24. -}
  25. -#endif
  26. extern const char *ath_bus_type_strings[];
  27. static inline const char *ath_bus_type_to_string(enum ath_bus_type bustype)